diff --git a/.ci/Debian11/Dockerfile b/.ci/Debian11/Dockerfile
new file mode 100644
index 000000000..b994863bf
--- /dev/null
+++ b/.ci/Debian11/Dockerfile
@@ -0,0 +1,26 @@
+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/Fedora44/Dockerfile b/.ci/Fedora42/Dockerfile
similarity index 95%
rename from .ci/Fedora44/Dockerfile
rename to .ci/Fedora42/Dockerfile
index e6c8da7f3..ee4a856f2 100644
--- a/.ci/Fedora44/Dockerfile
+++ b/.ci/Fedora42/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:44
+FROM fedora:42
 
 RUN dnf install -y \
         ccache \
diff --git a/.ci/Servatrice_Debian12/Dockerfile b/.ci/Servatrice_Debian11/Dockerfile
similarity index 75%
rename from .ci/Servatrice_Debian12/Dockerfile
rename to .ci/Servatrice_Debian11/Dockerfile
index 21f6a036e..fadc9e0e7 100644
--- a/.ci/Servatrice_Debian12/Dockerfile
+++ b/.ci/Servatrice_Debian11/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:12
+FROM debian:11
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -11,11 +11,11 @@ RUN apt-get update && \
         git \
         libmariadb-dev-compat \
         libprotobuf-dev \
-        libqt6sql6-mysql \
+        libqt5sql5-mysql \
+        libqt5websockets5-dev \
         ninja-build \
         protobuf-compiler \
-        qt6-tools-dev \
-        qt6-tools-dev-tools \
-        qt6-websockets-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
diff --git a/.ci/Ubuntu26.04/Dockerfile b/.ci/Ubuntu22.04/Dockerfile
similarity index 87%
rename from .ci/Ubuntu26.04/Dockerfile
rename to .ci/Ubuntu22.04/Dockerfile
index 7b0cd389f..ff2e6e43b 100644
--- a/.ci/Ubuntu26.04/Dockerfile
+++ b/.ci/Ubuntu22.04/Dockerfile
@@ -1,9 +1,8 @@
-FROM ubuntu:26.04
+FROM ubuntu:22.04
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         build-essential \
-        ca-certificates \
         ccache \
         clang-format \
         cmake \
@@ -16,14 +15,14 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
+        libqt6svg6-dev \
+        libqt6websockets6-dev \
         ninja-build \
         protobuf-compiler \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-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 ee846897b..424527f96 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -10,11 +10,9 @@
 # --test runs tests
 # --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 CCACHE_EVICTION_AGE BUILD_DIR CMAKE_GENERATOR TARGET_MACOS_VERSION
+# 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>)
 # exitcode: 1 for failure, 3 for invalid arguments
 
@@ -73,15 +71,6 @@ 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
@@ -95,15 +84,6 @@ 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
@@ -203,11 +183,7 @@ if [[ $RUNNER_OS == macOS ]]; then
       arch="x64"
     fi
     mkdir -p "$triplets_dir"
-    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"
+    cp "../vcpkg/triplets/$arch-osx.cmake" "$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")
@@ -275,16 +251,9 @@ 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
diff --git a/.ci/docker.sh b/.ci/docker.sh
index 46112daaa..911488ecf 100644
--- a/.ci/docker.sh
+++ b/.ci/docker.sh
@@ -3,28 +3,17 @@
 # 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.
-#
-# 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
+# <arg> 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
 # (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
-#
-# 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"
@@ -52,17 +41,12 @@ while [[ $# != 0 ]]; do
       shift
       ;;
     '--set-cache')
-      shift
-      if [[ $# == 0 ]]; then
-        echo "--set-cache expects an argument" >&2
-        exit 3
-      fi
-      CACHE=$1
-      shift
+      CACHE=$2
       if ! [[ -d $CACHE ]]; then
         echo "could not find cache path: $CACHE" >&2
         return 3
       fi
+      shift 2
       ;;
     *)
       if [[ ${1:0:1} == - ]]; then
@@ -165,11 +149,10 @@ function RUN ()
       args+=(--mount "type=bind,source=$CCACHE_DIR,target=/.ccache")
       args+=(--env "CCACHE_DIR=/.ccache")
     fi
-    if [[ $GITHUB_OUTPUT ]]; then
-      args+=(--mount "type=bind,source=$GITHUB_OUTPUT,target=/gh_output")
-      args+=(--env "GITHUB_OUTPUT=/gh_output")
+    if [[ -n "$CMAKE_GENERATOR" ]]; then
+      args+=(--env "CMAKE_GENERATOR=$CMAKE_GENERATOR")
     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 9786a83fc..cfb1e1f07 100755
--- a/.ci/lint_cpp.sh
+++ b/.ci/lint_cpp.sh
@@ -13,9 +13,17 @@ fi
 # Check formatting using format.sh
 echo "Checking your code using format.sh..."
 
-./format.sh --color-diff --cmake --shell --print-version --branch origin/master
+diff="$(./format.sh --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
@@ -28,10 +36,19 @@ 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
@@ -48,6 +65,9 @@ EOM
 ***                                                     ***
 ***********************************************************
 
+Used version:
+$used_version
+
 Exiting...
 EOM
     exit 0
diff --git a/.ci/prep_release.sh b/.ci/prep_release.sh
index 7f4f7d961..cddf49aa6 100755
--- a/.ci/prep_release.sh
+++ b/.ci/prep_release.sh
@@ -89,8 +89,6 @@ 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 ac78a193a..0e6c05165 100644
--- a/.ci/release_template.md
+++ b/.ci/release_template.md
@@ -17,17 +17,16 @@ Available pre-compiled binaries for installation:
    • <kbd>macOS 13+</kbd> <sub><i>Ventura</i></sub> <sub>Intel</sub>
 
   <b>Linux</b>
-   • <kbd>Ubuntu 26.04 LTS</kbd> <sub><i>Resolute Racoon</i></sub>
    • <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>Fedora 44</kbd>
+   • <kbd>Debian 11</kbd> <sub><i>Bullseye</i></sub>
    • <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>We provide a <kbd>Docker</kbd> image for "Servatrice" in <a href="https://github.com/Cockatrice/Cockatrice/pkgs/container/servatrice">GHCR</a>. You can docker pull it or use our Docker Compose files!</sub>
 </pre>
 
 
@@ -83,6 +82,7 @@ Remove empty headers when done.
 ### Under the Hood
 ### Oracle
 ### Servatrice
+### Webatrice
 
 </details>
 
diff --git a/.clang-format b/.clang-format
index 1db97481a..1ef3ca6db 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,9 +3,7 @@ AccessModifierOffset: -4
 ColumnLimit: 120
 ---
 Language: Cpp
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortFunctionsOnASingleLine: None
-BinPackParameters: false
+BreakBeforeBraces: Custom
 BraceWrapping:
   AfterClass: true
   AfterControlStatement: false
@@ -20,14 +18,16 @@ BraceWrapping:
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
-BreakBeforeBraces: Custom
-IncludeBlocks: Regroup
+AllowShortFunctionsOnASingleLine: None
+BinPackParameters: false
+AllowAllParametersOfDeclarationOnNextLine: false
 IndentCaseLabels: true
-InsertBraces: true
 PointerAlignment: Right
-RemoveSemicolon: true
 SortIncludes: true
+IncludeBlocks: Regroup
 StatementAttributeLikeMacros: [emit]
+# requires clang-format 16
+# RemoveSemicolon: true
 ---
 Language: Proto
 AllowShortFunctionsOnASingleLine: None
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 56ad64283..b293b3937 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -209,16 +209,6 @@ 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
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 404cac62e..1e278a418 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,21 +2,19 @@
 
 version: 2
 updates:
- # Enable version updates for git submodules
- # If SemVer is used, updates will happen to new releases only (not HEAD)
+ # # Enable version updates for git submodules
+ # Not yet possible to bump only on tags or releases, see:
  # https://github.com/dependabot/dependabot-core/issues/1639
  # https://github.com/dependabot/dependabot-core/issues/2192
-  - 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
+ # 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
 
  # # Enable version updates for Docker
  # Not yet possible to bump from one LTS version to the next and skip others, see:
@@ -39,3 +37,13 @@ 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/desktop-build.yml b/.github/workflows/desktop-build.yml
index 19c9a15e3..02c3f7aec 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -1,10 +1,10 @@
 name: Build Desktop
 
 permissions:
-  actions: write    # needed to delete entries in GHA cache (update ccache)
-  attestations: write    # needed to persist the attestation.
   contents: write
-  id-token: write    # needed for signing certificate in attestation
+  id-token: write
+  attestations: write
+  actions: write # needed for ccache action to be able to delete gha caches
 
 on:
   push:
@@ -14,12 +14,14 @@ on:
       - '*/**'    # matches all files not in root
       - '!**.md'
       - '!.github/**'
+      - '!.husky/**'
       - '!.tx/**'
       - '!doc/**'
+      - '!webclient/**'
       - '.github/workflows/desktop-build.yml'
       - 'CMakeLists.txt'
       - 'vcpkg.json'
-      - 'vcpkg'    # needed to match submodule bumps (gitlink)
+      - 'vcpkg'
     tags:
       - '*'
   pull_request:
@@ -27,28 +29,30 @@ on:
       - '*/**'    # matches all files not in root
       - '!**.md'
       - '!.github/**'
+      - '!.husky/**'
       - '!.tx/**'
       - '!doc/**'
+      - '!webclient/**'
       - '.github/workflows/desktop-build.yml'
       - 'CMakeLists.txt'
       - 'vcpkg.json'
-      - 'vcpkg'    # needed to match submodule bumps (gitlink)
+      - 'vcpkg'
 
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on master)
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: ${{ github.ref_type != 'tag' }}
+  cancel-in-progress: ${{ github.ref_name != 'master' }}
 
 jobs:
   configure:
     name: Configure
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     outputs:
-      tag: ${{ steps.configure.outputs.tag }}
-      sha: ${{ steps.configure.outputs.sha }}
+      tag: ${{steps.configure.outputs.tag}}
+      sha: ${{steps.configure.outputs.sha}}
 
     steps:  
-      - name: "Configure"
+      - name: Configure
         id: configure
         shell: bash
         run: |
@@ -64,200 +68,188 @@ jobs:
           fi
           echo "sha=$sha" >>"$GITHUB_OUTPUT"
 
-      - name: "Checkout"
+      - name: Checkout
         if: steps.configure.outputs.tag != null
         uses: actions/checkout@v6
         with:
-          fetch-depth: 0    # fetch all history for all branches and tags
+          fetch-depth: 0
 
-      - 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: |
-          args=()
-          [[ $prerelease == yes ]] && args+=(--prerelease)
-          
-          gh release create "$tag_name" --verify-tag --draft "${args[@]}" \
-            --target "$target" \
-            --title "$release_name" \
-            --notes-file "$body_path"
+          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"
 
   build-linux:
     strategy:
       fail-fast: false
       matrix:
-        # The files in ".ci/$distro$version" correspond to the values given here
+        # These names correspond to the files in ".ci/$distro$version"
         include:
           - distro: Arch
-            
-            allow-failure: yes
             package: skip    # We are packaged in Arch already
+            allow-failure: yes
+
+          - distro: Debian
+            version: 11
+            package: DEB
 
           - distro: Servatrice_Debian
-            version: 12
-            
+            version: 11
             package: DEB
-            server_only: yes
             test: skip
+            server_only: yes
 
           - 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
+
           - 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
+            package: DEB
 
           - distro: Ubuntu
             version: 24.04
-            
-            package: DEB
-            test: skip    # Running tests on all distros is superfluous
-
-          - distro: Ubuntu
-            version: 26.04
-            
             package: DEB
 
-    name: ${{ matrix.distro }} ${{ matrix.version }}
+    name: ${{matrix.distro}} ${{matrix.version}}
     needs: configure
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.allow-failure == 'yes' }}
-    timeout-minutes: 70
+    continue-on-error: ${{matrix.allow-failure == 'yes'}}
     env:
-      CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}    # directory for caching docker image and ccache
-      CCACHE_EVICTION_AGE: 7d
-      CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+      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: 550M
       CMAKE_GENERATOR: 'Ninja'
-      NAME: ${{ matrix.distro }}${{ matrix.version }}
 
     steps:
-      - name: "Checkout"
+      - name: Checkout
         uses: actions/checkout@v6
 
-      - name: "Restore compiler cache (ccache)"
+      - name: Restore compiler cache (ccache)
         id: ccache_restore
         uses: actions/cache/restore@v5
         env:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
-          key: ccache-${{ matrix.distro }}${{ matrix.version }}-${{ env.BRANCH_NAME }}
-          path: ${{ env.CACHE }}
-          restore-keys: ccache-${{ matrix.distro }}${{ matrix.version }}-
+          path: ${{env.CACHE}}
+          key: ccache-${{matrix.distro}}${{matrix.version}}-${{env.BRANCH_NAME}}
+          restore-keys: ccache-${{matrix.distro}}${{matrix.version}}-
 
-      - 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}}'
         run: |
           source .ci/docker.sh
-          RUN --server --debug --test --ccache "$CCACHE_SIZE" \
-            --cmake-generator "$CMAKE_GENERATOR"
+          RUN --server --debug --test --ccache "$CCACHE_SIZE"
 
-      - name: "Build release package"
+      - name: Build release package
         id: build
         if: matrix.package != 'skip'
         shell: bash
         env:
-          SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}'
-          package: '${{ matrix.package }}'
-          server_only: '${{ matrix.server_only }}'
+          BUILD_DIR: build
+          SUFFIX: '-${{matrix.distro}}${{matrix.version}}'
+          package: '${{matrix.package}}'
+          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
+          NO_CLIENT: ${{matrix.server_only == 'yes' && '--no-client' || '' }}
         run: |
           source .ci/docker.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")
-          
-          RUN --server --release --package "$package" "${args[@]}"
+          RUN --server --release --package "$package" --dir "$BUILD_DIR" \
+                  --ccache "$CCACHE_SIZE" $NO_CLIENT
+          .ci/name_build.sh
 
-      # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
-      - name: "Delete remote compiler cache (ccache)"
+      # 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.ccache_restore.outputs.cache-hit
-        continue-on-error: true
         env:
           GH_TOKEN: ${{ github.token }}
-        run: |
-          if gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }}; then
-            echo "Cache deleted successfully"
-          fi
+        run: gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }}
 
-      - name: "Save updated compiler cache (ccache)"
+      - name: Save updated compiler cache (ccache)
         if: github.ref == 'refs/heads/master'
         uses: actions/cache/save@v5
         with:
+          path: ${{env.CACHE}}
           key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
-          path: ${{ env.CACHE }}
 
-      - name: "Upload artifact"
+      - name: Upload artifact
         id: upload_artifact
         if: matrix.package != 'skip'
         uses: actions/upload-artifact@v7
         with:
+          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:
-          asset_name: ${{ steps.build.outputs.fullname }}
-          asset_path: ${{ steps.build.outputs.path }}
-          GH_TOKEN: ${{ github.token }}
-          tag_name: ${{ needs.configure.outputs.tag }}
+          GH_TOKEN: ${{github.token}}
+          tag_name: ${{needs.configure.outputs.tag}}
+          asset_name: ${{steps.build.outputs.fullname}}
+          asset_path: ${{steps.build.outputs.path}}
         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@v4
         with:
+          subject-path: ${{steps.build.outputs.path}}
           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 }}" --repo Cockatrice/Cockatrice
+          GH_TOKEN: ${{github.token}}
+        run: gh attestation verify ${{steps.build.outputs.path}} --repo Cockatrice/Cockatrice
 
   build-vcpkg:
     strategy:
@@ -267,218 +259,204 @@ jobs:
           - os: macOS
             target: 13
             runner: macos-15-intel
-            
-            ccache_eviction_age: 7d
-            cmake_generator: Ninja
-            make_package: 1
+            soc: Intel
+            xcode: "16.4"
+            type: Release
             override_target: 13
+            make_package: 1
             package_suffix: "-macOS13_Intel"
-            qt_version: 6.11.0
+            qt_version: 6.10.*
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
-            soc: Intel
-            type: Release
+            cmake_generator: Ninja
             use_ccache: 1
-            xcode: "16.4"
 
           - os: macOS
             target: 14
             runner: macos-14
-            
-            ccache_eviction_age: 7d
-            cmake_generator: Ninja
+            soc: Apple
+            xcode: "15.4"
+            type: Release
             make_package: 1
             package_suffix: "-macOS14"
-            qt_version: 6.11.0
+            qt_version: 6.10.*
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
-            soc: Apple
-            type: Release
+            cmake_generator: Ninja
             use_ccache: 1
-            xcode: "15.4"
 
           - os: macOS
             target: 15
             runner: macos-15
-            
-            ccache_eviction_age: 7d
-            cmake_generator: Ninja
+            soc: Apple
+            xcode: "16.4"
+            type: Release
             make_package: 1
             package_suffix: "-macOS15"
-            qt_version: 6.11.0
+            qt_version: 6.10.*
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
-            soc: Apple
-            type: Release
+            cmake_generator: Ninja
             use_ccache: 1
-            xcode: "16.4"
 
           - os: macOS
             target: 15
             runner: macos-15
-            
-            ccache_eviction_age: 7d
-            cmake_generator: Ninja
-            qt_version: 6.11.0
+            soc: Apple
+            xcode: "16.4"
+            type: Debug
+            qt_version: 6.10.*
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
-            soc: Apple
-            type: Debug
+            cmake_generator: Ninja
             use_ccache: 1
-            xcode: "16.4"
 
           - os: Windows
             target: 10
             runner: windows-2025
-            
-            cmake_generator: "Visual Studio 17 2022"
-            cmake_generator_platform: x64
+            type: Release
             make_package: 1
             package_suffix: "-Win10"
-            qt_version: 6.11.0
+            qt_version: 6.10.*
             qt_arch: win64_msvc2022_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
-            type: Release
+            cmake_generator: "Visual Studio 17 2022"
+            cmake_generator_platform: x64
 
-    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 }}
-    timeout-minutes: 100
+    runs-on: ${{matrix.runner}}
     env:
-      CCACHE_DIR: ${{ github.workspace }}/.cache/
-      CCACHE_SIZE: 550M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+      CCACHE_DIR: ${{github.workspace}}/.cache/
+      # 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: 550M
 
     steps:
-      - name: "Checkout"
+      - name: Checkout
         uses: actions/checkout@v6
         with:
           submodules: recursive
 
-      - name: "[Windows] Add msbuild to PATH"
+      - name: Add msbuild to PATH
         if: matrix.os == 'Windows'
         id: add-msbuild
-        uses: microsoft/setup-msbuild@v3
+        uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
 
-      - name: "[macOS] Setup ccache"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1
+      - name: Setup ccache
+        if: matrix.use_ccache == 1 && matrix.os == 'macOS'
         run: brew install ccache
 
-      - name: "[macOS] Restore compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1
+      - name: Restore compiler cache (ccache)
+        if: matrix.use_ccache == 1
         id: ccache_restore
         uses: actions/cache/restore@v5
         env:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
-          key: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-${{ env.BRANCH_NAME }}
-          path: ${{ env.CCACHE_DIR }}
-          restore-keys: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-
+          path: ${{env.CCACHE_DIR}}
+          key: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}-${{env.BRANCH_NAME}}
+          restore-keys: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}-
 
-      - name: "Install aqtinstall"
+      - name: Install aqtinstall
         run: pipx install aqtinstall
 
       # Resolve given wildcard versions (e.g. Qt 6.6.*) to latest version via aqtinstall to avoid stale caches on new releases
-      - name: "Resolve latest Qt patch version"
+      - name: Resolve latest Qt patch version
         id: resolve_qt_version
         shell: bash
-        run: .ci/resolve_latest_aqt_qt_version.sh "${{ matrix.qt_version }}"
+        run: .ci/resolve_latest_aqt_qt_version.sh "${{matrix.qt_version}}"
 
-      - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries"
+      - name: Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries (${{ matrix.soc }} macOS)
         if: matrix.os == 'macOS'
         id: restore_qt
         uses: actions/cache/restore@v5
         with:
-          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
           path: ${{ github.workspace }}/Qt
+          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
 
       # 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 ${{ steps.resolve_qt_version.outputs.version }}"
+      # qt build using vcpkg either just fails or takes too long to build
+      - name: Install fat Qt ${{ steps.resolve_qt_version.outputs.version }} (${{ matrix.soc }} macOS)
         if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
         uses: jurplel/install-qt-action@v4
         with:
-          arch: ${{ matrix.qt_arch }}
-          cache: false
-          dir: ${{ github.workspace }}
-          modules: ${{ matrix.qt_modules }}
           version: ${{ steps.resolve_qt_version.outputs.version }}
+          arch: ${{matrix.qt_arch}}
+          modules: ${{matrix.qt_modules}}
+          cache: false
+          dir: ${{github.workspace}}
 
-      - name: "[macOS] Create thin Qt libraries"
+      - name: Thin Qt libraries (${{ matrix.soc }} macOS)
         if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
         run: .ci/thin_macos_qtlib.sh
 
-      - name: "[macOS] Cache thin Qt libraries"
+      - name: Cache thin Qt libraries (${{ matrix.soc }} macOS)
         if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
         uses: actions/cache/save@v5
         with:
-          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
           path: ${{ github.workspace }}/Qt
+          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
 
-      - name: "[Windows] Install Qt ${{ matrix.qt_version }}"
+      - name: Install Qt ${{matrix.qt_version}} (Windows)
         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
-          arch: ${{ matrix.qt_arch }}
-          cache: true
-          modules: ${{ matrix.qt_modules }}
           version: ${{ steps.resolve_qt_version.outputs.version }}
+          arch: ${{matrix.qt_arch}}
+          modules: ${{matrix.qt_modules}}
+          cache: true
 
-      - name: "[Windows] Install NSIS"
+      - name: Install NSIS
         if: matrix.os == 'Windows'
         shell: bash
         run: choco install nsis
 
-      - name: "Setup vcpkg cache"
+      - 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 }}'
-          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'
-          MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
-          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 }}
-          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 }},readwrite'
+          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
+          MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
+          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
+          MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
+          DEVELOPER_DIR: '/Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer'
+          TARGET_MACOS_VERSION: ${{ matrix.override_target }}
         run: .ci/compile.sh --server --test --vcpkg
 
-      # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
-      - name: "[macOS] Delete remote compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
-        continue-on-error: true
+      # 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' && matrix.use_ccache == 1 && steps.ccache_restore.outputs.cache-hit
         env:
           GH_TOKEN: ${{ github.token }}
-        run: |
-          if gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }}; then
-            echo "Cache deleted successfully"
-          fi
+        run: gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }}
 
-      - name: "[macOS] Save updated compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master'
+      - name: Save updated compiler cache (ccache)
+        if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1
         uses: actions/cache/save@v5
         with:
+          path: ${{env.CCACHE_DIR}}
           key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
-          path: ${{ env.CCACHE_DIR }}
 
-      - name: "[macOS] Sign app bundle"
+      - name: Sign app bundle
         if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null
         id: sign_macos
         env:
@@ -488,15 +466,15 @@ jobs:
           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 ${{steps.build.outputs.path}}
           fi
 
-      - name: "[macOS] Notarize app bundle"
-        if: matrix.os == 'macOS' && steps.sign_macos.outcome == 'success'
+      - name: Notarize app bundle
+        if: steps.sign_macos.outcome == 'success'
         env:
           MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
-          MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
           MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
+          MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
         run: |
           if [[ -n "$MACOS_NOTARIZATION_APPLE_ID" ]]
           then
@@ -508,7 +486,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 ${{steps.build.outputs.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
@@ -520,51 +498,51 @@ 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 ${{steps.build.outputs.path}}
           fi
 
-      - name: "Upload artifact"
+      - name: Upload artifact
         if: matrix.make_package
         id: upload_artifact
         uses: actions/upload-artifact@v7
         with:
+          path: ${{steps.build.outputs.path}}
           archive: false
           if-no-files-found: error
-          path: ${{ steps.build.outputs.path }}
 
-      - name: "[Windows] Upload PDBs (Program Databases)"
+      - name: Upload PDBs (Program Databases)
         if: matrix.os == 'Windows' && github.ref_type != 'tag'
         uses: actions/upload-artifact@v7
         with:
-          if-no-files-found: error
-          name: ${{ steps.build.outputs.name }}-PDBs
+          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
         shell: bash
         env:
-          asset_name: ${{ steps.build.outputs.fullname }}
-          asset_path: ${{ steps.build.outputs.path }}
-          GH_TOKEN: ${{ github.token }}
-          tag_name: ${{ needs.configure.outputs.tag }}
+          GH_TOKEN: ${{github.token}}
+          tag_name: ${{needs.configure.outputs.tag}}
+          asset_name: ${{steps.build.outputs.fullname}}
+          asset_path: ${{steps.build.outputs.path}}
         run: gh release upload "$tag_name" "$asset_path#$asset_name"
 
-      - name: "Attest binary provenance"
+      - name: Attest binary provenance
         if: steps.upload_release.outcome == 'success'
         id: attestation
         uses: actions/attest@v4
         with:
+          subject-path: ${{steps.build.outputs.path}}
           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 }}" --repo Cockatrice/Cockatrice
+          GH_TOKEN: ${{github.token}}
+        run: gh attestation verify ${{steps.build.outputs.path}} --repo Cockatrice/Cockatrice
diff --git a/.github/workflows/desktop-lint.yml b/.github/workflows/desktop-lint.yml
index 54931933c..433f302a5 100644
--- a/.github/workflows/desktop-lint.yml
+++ b/.github/workflows/desktop-lint.yml
@@ -1,15 +1,17 @@
 name: Code Style (C++) 
 
 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'
@@ -18,23 +20,20 @@ on:
 
 jobs:
   format:
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-22.04
 
     steps:
-    - name: "Checkout"
+    - name: Checkout
       uses: actions/checkout@v6
       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 d9ff06282..2a4aab1ea 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -1,11 +1,9 @@
 name: Build Docker Image
 
-permissions:
-  contents: read
-  packages: write
-
 on:
   push:
+    tags:
+      - '*Release*'
     branches:
       - master
   pull_request:
@@ -14,64 +12,56 @@ on:
     paths:
       - '.github/workflows/docker-release.yml'
       - 'Dockerfile'
-  release:
-    types:
-      - released    # publishing of stable releases
-
-# 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' }}
 
 jobs:
   docker:
     name: amd64 & arm64
-    if: ${{ github.repository_owner == 'Cockatrice' }}
     runs-on: ubuntu-latest
-  
+    permissions:
+      contents: read
+      packages: write
+
     steps:
-      - name: "Checkout"
+      - name: Checkout
         uses: actions/checkout@v6
 
-      - name: "Docker metadata"
+      - name: Docker metadata
         id: metadata
         uses: docker/metadata-action@v6
-        env:
-          DOCKER_METADATA_ANNOTATIONS_LEVELS: index    # needed for GHCR
         with:
-          annotations: |
-            org.opencontainers.image.title=Servatrice
-            org.opencontainers.image.url=https://cockatrice.github.io/
-            org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games
           images: |
             ghcr.io/cockatrice/servatrice
           labels: |
             org.opencontainers.image.title=Servatrice
             org.opencontainers.image.url=https://cockatrice.github.io/
             org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games
+          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  
 
-      - name: "Set up QEMU"
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v4
 
-      - name: "Set up Docker buildx"
+      - name: Set up Docker buildx
         uses: docker/setup-buildx-action@v4
 
-      - name: "Login to GitHub Container Registry"
-        if: contains(github.event.release.tag_name, 'Release') && github.event.release.target_commitish == 'master'
-        uses: docker/login-action@v4
+      - name: Login to GitHub Container Registry
+        if: github.ref_type == 'tag'
+        uses: docker/login-action@v3
         with:
-          password: ${{ github.token }}
           registry: ghcr.io
           username: ${{ github.actor }}
+          password: ${{ github.token }}
 
-      - name: "Build and push Docker image"
+      - name: Build and push Docker image
         uses: docker/build-push-action@v7
         with:
-          annotations: ${{ steps.metadata.outputs.annotations }}
-          cache-from: type=gha,scope=servatrice
-          cache-to: type=gha,mode=max,scope=servatrice
           context: .
-          labels: ${{ steps.metadata.outputs.labels }}
           platforms: linux/amd64,linux/arm64
           push: ${{ github.ref_type == 'tag' }}
           tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          annotations: ${{ steps.metadata.outputs.annotations }}
+          cache-from: type=gha,scope=servatrice
+          cache-to: type=gha,mode=max,scope=servatrice
diff --git a/.github/workflows/documentation-build.yml b/.github/workflows/documentation-build.yml
index 717999d5a..ce331d113 100644
--- a/.github/workflows/documentation-build.yml
+++ b/.github/workflows/documentation-build.yml
@@ -1,18 +1,18 @@
 name: Generate Docs
 
 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:
 
 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,22 +20,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: "Checkout code"
+      - name: Checkout code
         uses: actions/checkout@v6
         with:
           submodules: recursive
 
-      - name: "Install Graphviz"
+      - name: Install Graphviz
         run: |
           sudo apt-get install -y graphviz
           dot -V
 
-      - name: "Install Doxygen"
+      - name: Install Doxygen
         uses: ssciwr/doxygen-install@v2
         with:
-          version: "1.16.1"
+          version: "1.14.0"
 
-      - name: "Update Doxygen Configuration"
+      - name: Update Doxygen Configuration
         run: |
           git diff Doxyfile
           doxygen -u Doxyfile
@@ -48,16 +48,16 @@ jobs:
             exit 1
           fi
 
-      - name: "Generate Documentation"
+      - name: Generate Documentation
         if: always()
         run: doxygen Doxyfile
 
-      - name: "Deploy to cockatrice.github.io"
-        if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+      - name: Deploy to cockatrice.github.io
+        if: github.event_name != 'pull_request'
         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/
diff --git a/.github/workflows/translations-pull.yml b/.github/workflows/translations-pull.yml
index 057381f8a..ed61e3b19 100644
--- a/.github/workflows/translations-pull.yml
+++ b/.github/workflows/translations-pull.yml
@@ -1,14 +1,14 @@
 name: Update Translations
 
 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,21 +16,21 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
 
     name: Pull languages
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
 
     steps:
-      - name: "Checkout repo"
+      - name: Checkout repo
         uses: actions/checkout@v6
 
-      - name: "Pull translated strings from Transifex"
+      - name: Pull translated strings from Transifex
         uses: transifex/cli-action@v2
         with:
-          # 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
+          # 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 }}
+          args: pull --force --all
 
-      - name: "Create pull request"
+      - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
         uses: peter-evans/create-pull-request@v8
@@ -38,7 +38,13 @@ jobs:
           add-paths: |
             cockatrice/translations/*.ts
             oracle/translations/*.ts
-          author: github-actions <github-actions@github.com>    # owner of the commit
+            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'
           body: |
             Pulled all translated strings from [Transifex][1].
             
@@ -48,16 +54,12 @@ jobs:
             
             [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
-          title: 'Update translations'
+          draft: false
 
-      - name: "PR Status"
+      - name: PR Status
         if: github.event_name != 'pull_request'
         shell: bash
         env:
diff --git a/.github/workflows/translations-push.yml b/.github/workflows/translations-push.yml
index 4adcaf4a4..777e9e6ac 100644
--- a/.github/workflows/translations-push.yml
+++ b/.github/workflows/translations-push.yml
@@ -1,14 +1,14 @@
 name: Update Translation Source
 
 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,19 +16,19 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
 
     name: Push strings
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
 
     steps:
-      - name: "Checkout repo"
+      - name: Checkout repo
         uses: actions/checkout@v6
 
-      - 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
         id: cockatrice
         shell: bash
         run: |
@@ -36,17 +36,17 @@ jobs:
           export DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')"
           FILE="$FILE" DIRS="$DIRS" .ci/update_translation_source_strings.sh
 
-      - name: "Update Oracle translation source"
+      - name: Update Oracle translation source
         id: oracle
         shell: bash
         env:
-          DIRS: 'oracle/src'
           FILE: 'oracle/oracle_en@source.ts'
+          DIRS: 'oracle/src'
         run: .ci/update_translation_source_strings.sh
 
-      - name: "Render template"
+      - name: Render template
         id: template
-        uses: chuhlomin/render-template/binary@v1
+        uses: chuhlomin/render-template@v1
         with:
           template: .ci/update_translation_source_strings_template.md
           vars: |
@@ -54,7 +54,7 @@ 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@v8
@@ -62,18 +62,19 @@ jobs:
           add-paths: |
             cockatrice/cockatrice_en@source.ts
             oracle/oracle_en@source.ts
-          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
+          # author is the owner of the commit
+          author: github-actions <github-actions@github.com>
+          branch: ci-update_translation_source
           delete-branch: true
-          draft: false
+          title: 'Update source strings'
+          body: ${{ steps.template.outputs.result }}
           labels: |
             CI
             Translation
-          title: 'Update source strings'
+          draft: false
 
-      - name: "PR Status"
+      - name: PR Status
         if: github.event_name != 'pull_request'
         shell: bash
         env:
diff --git a/.github/workflows/web-build.yml b/.github/workflows/web-build.yml
new file mode 100644
index 000000000..8d756da02
--- /dev/null
+++ b/.github/workflows/web-build.yml
@@ -0,0 +1,54 @@
+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
new file mode 100644
index 000000000..8a90325e7
--- /dev/null
+++ b/.github/workflows/web-lint.yml
@@ -0,0 +1,33 @@
+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/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 000000000..369435d6b
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,7 @@
+#!/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 8174a4dfd..9bc5ce950 100644
--- a/.tx/config
+++ b/.tx/config
@@ -16,3 +16,11 @@ 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 c10e1db68..fe808a652 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,11 +74,11 @@ endif()
 
 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 3.1.0)
+project("Cockatrice" VERSION 2.11.0)
 
 # Set release name if not provided via env/cmake var
 if(NOT DEFINED GIT_TAG_RELEASENAME)
-  set(GIT_TAG_RELEASENAME "Graduation Day")
+  set(GIT_TAG_RELEASENAME "Omenpath")
 endif()
 
 # Use c++20 for all targets
@@ -174,7 +174,6 @@ 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})
diff --git a/Dockerfile b/Dockerfile
index 7c5c773c9..d185b746a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # -------- Build Stage --------
-FROM ubuntu:26.04 AS build
+FROM ubuntu:24.04 AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -26,7 +26,7 @@ RUN mkdir build && cd build && \
 
 
 # -------- Runtime Stage (clean) --------
-FROM ubuntu:26.04
+FROM ubuntu:24.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   libprotobuf32t64 \
diff --git a/Doxyfile b/Doxyfile
index fc96b5f22..0f2642fd8 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.16.1
+# Doxyfile 1.14.0
 
 # This file describes the settings to be used by the documentation system
 # Doxygen (www.doxygen.org) for a project.
@@ -361,20 +361,6 @@ 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.
@@ -406,8 +392,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 \ref commands.
+# AUTOLINK_SUPPORT. This list does not affect links explicitly created using \#
+# or the \link or commands.
 # This tag requires that the tag AUTOLINK_SUPPORT is set to YES.
 
 AUTOLINK_IGNORE_WORDS  =
@@ -524,9 +510,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: 512, default value: 1.
+# Minimum value: 0, maximum value: 32, default value: 1.
 
-NUM_PROC_THREADS       = 0
+NUM_PROC_THREADS       = 1
 
 # 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
@@ -793,27 +779,6 @@ 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 traceablility 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.
@@ -1105,7 +1070,8 @@ EXCLUDE                = build/ \
                          cmake/ \
                          doc/doxygen/theme/docs/ \
                          doc/doxygen/theme/include/ \
-                         vcpkg/
+                         vcpkg/ \
+                         webclient/
 
 # 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
@@ -1921,7 +1887,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, MathJax_3 and MathJax_4.
+# Possible values are: MathJax_2 and MathJax_3.
 # The default value is: MathJax_2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1930,10 +1896,9 @@ 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:
-# 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
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
 # (see:
-# https://docs.mathjax.org/en/v4.0/output/index.htm).
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # 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
@@ -1946,50 +1911,36 @@ 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. 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.s 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:
+# 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:
 # - 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/tex.html):
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
 # For example for MathJax version 3 (see
-# https://docs.mathjax.org/en/v3.2/input/tex/extensions/):
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
 # 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
-# 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.
+# 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.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_CODEFILE       =
@@ -2650,7 +2601,7 @@ 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: 512, default value: 0.
+# Minimum value: 0, maximum value: 32, default value: 0.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
diff --git a/README.md b/README.md
index 9a27601cd..8ad9a092c 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,6 +25,7 @@
 
 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)
@@ -47,7 +48,6 @@ Latest <kbd>beta</kbd> version:
 - [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)
@@ -107,12 +107,12 @@ Cockatrice tries to use the [Google Developer Documentation Style Guide](https:/
 
 ### Translation [![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 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)
+# 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)
 
 Dependencies: *(for minimum versions search our [CMake file](https://github.com/Cockatrice/Cockatrice/blob/master/CMakeLists.txt))*
 - [Qt](https://www.qt.io/developers/)
diff --git a/cmake/FindQtRuntime.cmake b/cmake/FindQtRuntime.cmake
index 485affe52..42060c835 100644
--- a/cmake/FindQtRuntime.cmake
+++ b/cmake/FindQtRuntime.cmake
@@ -42,7 +42,7 @@ 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.4.2
+    Qt6 6.2.3
     COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist
     QUIET HINTS ${Qt6_DIR}
   )
diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in
index 7b52b7bcc..2fdc61fb9 100644
--- a/cmake/NSIS.template.in
+++ b/cmake/NSIS.template.in
@@ -11,7 +11,6 @@ SetCompressor LZMA
 Var NormalDestDir
 Var PortableDestDir
 Var PortableMode
-Var ReinstallMode
 
 !include LogicLib.nsh
 !include FileFunc.nsh
@@ -29,23 +28,13 @@ Var ReinstallMode
 !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
@@ -84,7 +73,6 @@ ${IfNot} ${Errors}
     MessageBox MB_ICONINFORMATION|MB_SETFOREGROUND "\
       /PORTABLE : Install in portable mode$\n\
       /S : Silent install$\n\
-      /R : Silent upgrade$\n\
       /D=%directory% : Specify destination directory$\n"
     Quit
 ${EndIf}
@@ -102,16 +90,6 @@ ${Else}
     ${EndIf}
 ${EndIf}
 
-ClearErrors
-${GetOptions} $9 "/R" $8
-${IfNot} ${Errors}
-    StrCpy $ReinstallMode 1
-    SetSilent silent
-    SetAutoClose true
-${Else}
-    StrCpy $ReinstallMode 0
-${EndIf}
-
 ${If} $InstDir == ""
     ; User did not use /D to specify a directory,
     ; we need to set a default based on the install mode
@@ -119,22 +97,6 @@ ${If} $InstDir == ""
 ${EndIf}
 Call SetModeDestinationFromInstdir
 
-; --- Detect portable install when using /R ---
-${If} $ReinstallMode = 1
-    IfFileExists "$InstDir\portable.dat" 0 not_portable
-        StrCpy $PortableMode 1
-        Goto portable_done
-
-    not_portable:
-        StrCpy $PortableMode 0
-
-    portable_done:
-${EndIf}
-
-${If} $ReinstallMode = 1
-    Call AutoUninstallIfNeeded
-${EndIf}
-
 FunctionEnd
 
 Function un.onInit
@@ -164,46 +126,8 @@ ${Else}
 ${EndIf}
 FunctionEnd
 
-Function SkipIfReinstall
-${If} $ReinstallMode = 1
-    Abort
-${EndIf}
-FunctionEnd
-
-Function AutoUninstallIfNeeded
-
-SetShellVarContext all
-
-; --- 32-bit uninstall ---
-SetRegView 32
-ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
-
-StrCmp $R0 "" done32
-DetailPrint "Removing previous version (32-bit)..."
-ExecWait '$R0'
-
-done32:
-
-; --- 64-bit uninstall ---
-${If} ${RunningX64}
-    SetRegView 64
-    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
-
-    StrCmp $R0 "" done64
-    DetailPrint "Removing previous version (64-bit)..."
-    ExecWait '$R0'
-
-    done64:
-${EndIf}
-
-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
@@ -235,11 +159,6 @@ ${EndIf}
 FunctionEnd
 
 Function componentsPagePre
-
-${If} $ReinstallMode = 1
-    Return
-${EndIf}
-
 ${If} $PortableMode = 0
     SetShellVarContext all
 
@@ -249,12 +168,8 @@ ${If} $PortableMode = 0
     ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
     StrCmp $R0 "" done32
 
-    ${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}
+    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst32
+    Abort
 
     uninst32:
     ClearErrors
@@ -269,12 +184,8 @@ ${If} $PortableMode = 0
 	    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
 	    StrCmp $R0 "" done64
 
-	    ${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}
+	    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst64
+	    Abort
 
 	    uninst64:
 	    ClearErrors
@@ -366,12 +277,6 @@ ${Else}
     FileWrite $0 "PORTABLE"
     FileClose $0
 ${EndIf}
-
-${If} $ReinstallMode = 1
-    IfFileExists "$INSTDIR\cockatrice.exe" 0 +2
-        Exec '"$INSTDIR\cockatrice.exe"'
-${EndIf}
-
 SectionEnd
 
 Section "Start menu item" SecStartMenu
diff --git a/cmake/getversion.cmake b/cmake/getversion.cmake
index b24b520d5..cb27ebd87 100644
--- a/cmake/getversion.cmake
+++ b/cmake/getversion.cmake
@@ -213,8 +213,7 @@ 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)
-  string(REPLACE " " "-" PROJECT_VERSION_RELEASENAME_SAFE "${PROJECT_VERSION_RELEASENAME}")
-  set(PROJECT_VERSION_FILENAME "${PROJECT_VERSION_FILENAME}-${PROJECT_VERSION_RELEASENAME_SAFE}")
+  set(PROJECT_VERSION_FILENAME "${PROJECT_VERSION_FILENAME}-${PROJECT_VERSION_RELEASENAME}")
 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 2062d7f8c..2d71a55e5 100644
--- a/cmake/gtest-CMakeLists.txt.in
+++ b/cmake/gtest-CMakeLists.txt.in
@@ -1,16 +1,15 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.2)
 
 project(gtest-download LANGUAGES NONE)
 
 include(ExternalProject)
-externalproject_add(
-  googletest
-  URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.zip
-  URL_HASH SHA1=f638fa0e724760e2ba07ff8cfba32cd644e1ce28
+ExternalProject_Add(googletest
+  URL https://github.com/google/googletest/archive/release-1.11.0.zip
+  URL_HASH SHA1=9ffb7b5923f4a8fcdabf2f42c6540cce299f44c0
   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/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index bd99d08bf..1ca3c77c2 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -7,7 +7,6 @@ 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
@@ -56,73 +55,68 @@ set(cockatrice_SOURCES
     src/filters/filter_tree_model.cpp
     src/filters/syntax_help.cpp
     src/game/abstract_game.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/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/board/card_list.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/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/game.cpp
     src/game/game_event_handler.cpp
     src/game/game_meta_info.cpp
-    src/game_graphics/game_scene.cpp
+    src/game/game_scene.cpp
     src/game/game_state.cpp
-    src/game_graphics/game_view.cpp
-    src/game_graphics/hand_counter.cpp
-    src/game_graphics/log/message_log_widget.cpp
+    src/game/game_view.cpp
+    src/game/hand_counter.cpp
+    src/game/log/message_log_widget.cpp
     src/game/phase.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/utility_menu.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/player/player_actions.cpp
-    src/game_graphics/player/player_area.cpp
-    src/game_graphics/player/player_dialogs.cpp
+    src/game/player/player_area.cpp
     src/game/player/player_event_handler.cpp
-    src/game_graphics/player/player_graphics_item.cpp
+    src/game/player/player_graphics_item.cpp
     src/game/player/player_info.cpp
-    src/game_graphics/player/player_list_widget.cpp
-    src/game/player/player_logic.cpp
+    src/game/player/player_list_widget.cpp
     src/game/player/player_manager.cpp
-    src/game_graphics/player/player_target.cpp
+    src/game/player/player_target.cpp
     src/game/replay.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/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_graphics/board/abstract_graphics_item.cpp
     src/interface/card_picture_loader/card_picture_loader.cpp
     src/interface/card_picture_loader/card_picture_loader_local.cpp
@@ -135,13 +129,7 @@ set(cockatrice_SOURCES
     src/interface/layouts/overlap_layout.cpp
     src/interface/widgets/utility/line_edit_completer.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/mana_cost_widget.cpp
     src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
@@ -183,7 +171,6 @@ set(cockatrice_SOURCES
     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
@@ -229,7 +216,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/replay/replay_manager.cpp
     src/interface/widgets/replay/replay_timeline_widget.cpp
     src/interface/widgets/server/chat_view/chat_view.cpp
-    src/interface/widgets/server/game_filter_configs.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
@@ -241,14 +227,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/server/user/user_info_connection.cpp
     src/interface/widgets/server/user/user_list_manager.cpp
     src/interface/widgets/server/user/user_list_widget.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/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/sequence_edit.cpp
@@ -347,8 +325,6 @@ set(cockatrice_SOURCES
     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
 )
 
 add_subdirectory(sounds)
@@ -563,7 +539,6 @@ if(WIN32)
     DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
     DESTINATION ./
     FILES_MATCHING
-    PATTERN "CMakeFiles" EXCLUDE
     PATTERN "*.ini"
   )
 
@@ -589,9 +564,6 @@ 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"
diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 9c34929b7..37fb145f0 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -55,7 +55,6 @@
         <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>
@@ -70,7 +69,6 @@
         <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>
diff --git a/cockatrice/cockatrice_en@source.ts b/cockatrice/cockatrice_en@source.ts
index 810b345df..9a2f56f07 100644
--- a/cockatrice/cockatrice_en@source.ts
+++ b/cockatrice/cockatrice_en@source.ts
@@ -25,12 +25,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -38,60 +38,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -133,168 +133,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
-        <source>Theme settings</source>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="725"/>
-        <source>Current theme:</source>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
-        <source>Open themes folder</source>
+        <source>Theme settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
+        <source>Current theme:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
+        <source>Open themes folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
+        <source>Home tab background source:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <source>Display card name of background in bottom right:</source>
+        <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
-        <source>Menu settings</source>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
+        <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
-        <source>Show keyboard shortcuts in right-click menus</source>
+        <source>Menu settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <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="735"/>
         <source>Show game filter toolbar above list in room tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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="742"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <source>Scale cards on mouse over</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="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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="748"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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="752"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
         <source>Hand layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -302,12 +324,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <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="93"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -626,22 +643,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -677,124 +694,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="439"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -810,133 +827,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <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="187"/>
+        <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="189"/>
         <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="190"/>
-        <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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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="203"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</comment>
+        <translation type="unfinished"></translation>
+    </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"></translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
-        <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </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"></translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
@@ -998,7 +1015,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1006,7 +1023,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1029,32 +1046,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <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="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1062,32 +1079,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1160,17 +1177,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="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1293,7 +1310,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1301,166 +1318,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1468,32 +1485,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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="71"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1501,27 +1518,27 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1529,12 +1546,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1631,94 +1648,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <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="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <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="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <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="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <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="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <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="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <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="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <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="488"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="415"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1751,32 +1768,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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="257"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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="275"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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="299"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1843,29 +1860,29 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <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="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <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="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2867,17 +2884,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2885,43 +2902,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <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="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="94"/>
         <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="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2940,73 +2957,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
         <translation type="unfinished"></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"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/game/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="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3167,12 +3151,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <source>Unknown Error loading card database</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="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3183,7 +3167,7 @@ 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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3194,7 +3178,7 @@ 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="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3203,21 +3187,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3226,59 +3210,59 @@ 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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</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="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3591,67 +3575,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <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>
@@ -4105,143 +4089,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <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/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <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/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <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/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4249,47 +4233,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/player/menu/grave_menu.cpp" line="97"/>
         <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/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <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/player/menu/grave_menu.cpp" line="106"/>
         <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/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4297,88 +4281,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4386,52 +4370,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4439,213 +4423,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
         <source>Lend library to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
         <source>Shuffle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
         <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="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <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="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="235"/>
-        <source>Move top cards to graveyard face down...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="236"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="237"/>
-        <source>Move top cards to exile face down...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="238"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <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="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <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="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <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="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="248"/>
-        <source>Move bottom cards to graveyard face down...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="249"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="250"/>
-        <source>Move bottom cards to exile face down...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="251"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4739,8 +4703,18 @@ Will now login.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4843,8 +4817,8 @@ Will now login.</source>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5245,63 +5219,63 @@ Local version is %1, remote version is %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5311,81 +5285,81 @@ Do you want to enable it/them?</source>
         </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <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="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5393,54 +5367,54 @@ 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="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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <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="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5491,7 +5465,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5645,233 +5619,223 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source>the top card of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <source> from the top of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <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="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <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="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <source>%1 gives %2 control over %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <source>%1 puts %2 into play%3.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <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"></translation>
-    </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"></translation>
-    </message>
     <message>
         <location filename="src/game/log/message_log_widget.cpp" line="317"/>
-        <source>%1 exiles %2%3 face down.</source>
+        <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5880,62 +5844,52 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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"></translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="349"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -5943,12 +5897,12 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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">
@@ -5957,72 +5911,72 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <source>The game has been closed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <source>%1 is now watching the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <source>%1 shuffles their deck and draws a new hand of %2 card(s).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -6030,28 +5984,28 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <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="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <source>%1 card(s)</source>
         <comment>a card for singular, %1 cards for plural</comment>
         <translation type="unfinished">
@@ -6060,107 +6014,107 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -6168,7 +6122,7 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -6176,97 +6130,97 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6274,110 +6228,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <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="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6390,37 +6344,32 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <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="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <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="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <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="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6562,57 +6511,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6629,138 +6578,134 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <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"></translation>
-    </message>
     <message>
         <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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <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="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6768,65 +6713,48 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</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>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="155"/>
-        <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6875,25 +6803,17 @@ This setting means you&apos;ll only see the default printing for each card, inst
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7032,33 +6952,6 @@ This setting means you&apos;ll only see the default printing for each card, inst
         <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="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"></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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
@@ -7207,37 +7100,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7280,14 +7173,6 @@ Are you sure you would like to disable this feature?</source>
         <translation type="unfinished"></translation>
     </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"></translation>
-    </message>
-</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -7352,53 +7237,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7465,27 +7350,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7701,123 +7586,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <source>Desc.</source>
         <translation type="unfinished"></translation>
     </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"></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="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"></translation>
-    </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"></translation>
-    </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"></translation>
-    </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"></translation>
-    </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"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"></translation>
-    </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"></translation>
-    </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"></translation>
-    </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"></translation>
-    </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"></translation>
-    </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"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"></translation>
-    </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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <source>Asc.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</source>
         <translation type="unfinished"></translation>
     </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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -7825,52 +7646,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7878,55 +7707,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <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="300"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="306"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7991,7 +7826,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8072,18 +7907,18 @@ Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8101,12 +7936,12 @@ Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8155,191 +7990,197 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</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="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</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="289"/>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</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="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</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="300"/>
         <source>Reverse turn order</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="303"/>
         <source>&amp;Remove all local arrows</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="306"/>
         <source>Rotate View Cl&amp;ockwise</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="309"/>
         <source>Rotate View Co&amp;unterclockwise</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="312"/>
         <source>Game &amp;information</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="315"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the 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="641"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9439,152 +9280,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <source>Do not delete &amp;arrows inside of subphases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <source>Show selection counter during drag selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
-        <source>Show total selection counter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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="979"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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="980"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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="982"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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="984"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9648,24 +9479,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: 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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <source>Mode: Include/Exclude</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9692,108 +9522,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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="71"/>
-        <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="72"/>
-        <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="73"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9801,32 +9548,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"></translation>
-    </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"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9862,7 +9599,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9870,19 +9607,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9890,37 +9627,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="71"/>
-        <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="72"/>
-        <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="73"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9934,22 +9661,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <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="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9957,64 +9714,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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="93"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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="96"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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="118"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10022,17 +9771,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10048,52 +9797,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="131"/>
-        <source>Show Color Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="132"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <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="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10194,133 +9938,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <source>Move selected set to the top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <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="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</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="135"/>
         <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="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10328,72 +10072,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <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="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Group by Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Sort by Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10428,7 +10172,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10509,7 +10253,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10661,7 +10405,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11082,8 +10826,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <source>Toggle Untap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -11103,102 +10846,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="516"/>
-        <source>Play Card, Face Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Attach Card...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <source>Reveal Selected Cards to All Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</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="562"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</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="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</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="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11234,246 +10973,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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"></translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="607"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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"></translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/cockatrice/resources/config/qtlogging.ini b/cockatrice/resources/config/qtlogging.ini
index 7ac0d9ca4..20aa206ce 100644
--- a/cockatrice/resources/config/qtlogging.ini
+++ b/cockatrice/resources/config/qtlogging.ini
@@ -28,8 +28,6 @@
 #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
deleted file mode 100644
index de85228dc..000000000
--- a/cockatrice/resources/config/storage.svg
+++ /dev/null
@@ -1,799 +0,0 @@
-<?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/icons/mana/C.svg b/cockatrice/resources/icons/mana/C.svg
deleted file mode 100644
index eb09fb872..000000000
--- a/cockatrice/resources/icons/mana/C.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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/src/client/network/connection_controller/remote_connection_controller.cpp b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
deleted file mode 100644
index 75cedcafc..000000000
--- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
+++ /dev/null
@@ -1,587 +0,0 @@
-#include "remote_connection_controller.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 <QDateTime>
-#include <QLineEdit>
-#include <QMessageBox>
-#include <QThread>
-#include <libcockatrice/network/client/remote/remote_client.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-
-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, &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(QPixmap("theme: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::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
deleted file mode 100644
index 7486bc81a..000000000
--- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H
-#define COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H
-
-#include "abstract_client.h"
-
-#include <QMessageBox>
-#include <QObject>
-#include <QString>
-#include <QThread>
-#include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
-#include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
-
-class RemoteClient;
-class ServerInfo_User;
-class DlgConnect;
-
-/**
- * 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);
-
-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 8689a19e9..0298daa6b 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
@@ -6,12 +6,12 @@
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
-#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(QObject *parent) : QObject(parent)
+DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent)
+    : QObject(parent), cardDatabase(_cardDatabase)
 {
     manager = new QNetworkAccessManager(this);
     connect(manager, &QNetworkAccessManager::finished, this, &DeckStatsInterface::queryFinished);
@@ -70,8 +70,8 @@ void DeckStatsInterface::analyzeDeck(const DeckList &deck)
 
 void DeckStatsInterface::copyDeckWithoutTokens(const DeckList &source, DeckList &destination)
 {
-    auto copyIfNotAToken = [&destination](const auto node, const auto card) {
-        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
+    auto copyIfNotAToken = [this, &destination](const auto node, const auto card) {
+        CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName());
         if (dbCard && !dbCard->getIsToken()) {
             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 09bf998de..7dc841027 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.h
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.h
@@ -1,12 +1,13 @@
 /**
  * @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>
 
 class QByteArray;
@@ -20,6 +21,8 @@ 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
@@ -32,7 +35,7 @@ private slots:
     void getAnalyzeRequestData(const DeckList &deck, QByteArray &data);
 
 public:
-    explicit DeckStatsInterface(QObject *parent = nullptr);
+    explicit DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
     void analyzeDeck(const DeckList &deck);
 };
 
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
index 5dc77fa2c..a30a7f531 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
@@ -6,12 +6,12 @@
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
-#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(QObject *parent) : QObject(parent)
+TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent)
+    : QObject(parent), cardDatabase(_cardDatabase)
 {
     manager = new QNetworkAccessManager(this);
     connect(manager, &QNetworkAccessManager::finished, this, &TappedOutInterface::queryFinished);
@@ -89,26 +89,22 @@ void TappedOutInterface::analyzeDeck(const DeckList &deck)
     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(const DeckList &source, DeckList &mainboard, DeckList &sideboard)
 {
-    auto copyMainOrSide = [&mainboard, &sideboard](const auto node, const auto card) {
-        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
-        if (!dbCard || dbCard->getIsToken()) {
+    auto copyMainOrSide = [this, &mainboard, &sideboard](const auto node, const auto card) {
+        CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName());
+        if (!dbCard || dbCard->getIsToken())
             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 32f9369d5..0ea9c8358 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.h
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.h
@@ -1,14 +1,14 @@
 /**
  * @file tapped_out_interface.h
  * @ingroup ApiInterfaces
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
-#include <QLoggingCategory>
-#include <QObject>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
 
@@ -29,13 +29,14 @@ class TappedOutInterface : public QObject
 private:
     QNetworkAccessManager *manager;
 
+    CardDatabase &cardDatabase;
     void copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard);
 private slots:
     void queryFinished(QNetworkReply *reply);
     void getAnalyzeRequestData(const DeckList &deck, QByteArray &data);
 
 public:
-    explicit TappedOutInterface(QObject *parent = nullptr);
+    explicit TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
     void analyzeDeck(const DeckList &deck);
 };
 
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 bbdd70c97..1e2372fd1 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 87fde4d54..1818aa35c 100644
--- a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h
+++ b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h
@@ -1,8 +1,8 @@
 /**
  * @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
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 03d4897a2..a2feb5ccf 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
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 1a89de533..4e6f279c3 100644
--- a/cockatrice/src/client/network/update/client/client_update_checker.h
+++ b/cockatrice/src/client/network/update/client/client_update_checker.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/client/network/update/client/release_channel.cpp b/cockatrice/src/client/network/update/client/release_channel.cpp
index 260167bc8..9edfe7caf 100644
--- a/cockatrice/src/client/network/update/client/release_channel.cpp
+++ b/cockatrice/src/client/network/update/client/release_channel.cpp
@@ -129,9 +129,8 @@ void StableReleaseChannel::releaseListFinished()
         return;
     }
 
-    if (!lastRelease) {
+    if (!lastRelease)
         lastRelease = new Release;
-    }
 
     lastRelease->setName(resultMap["name"].toString());
     lastRelease->setDescriptionUrl(resultMap["html_url"].toString());
@@ -247,9 +246,8 @@ 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());
diff --git a/cockatrice/src/client/network/update/client/release_channel.h b/cockatrice/src/client/network/update/client/release_channel.h
index c56d0cfce..93e6b985d 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
diff --git a/cockatrice/src/client/network/update/client/update_downloader.cpp b/cockatrice/src/client/network/update/client/update_downloader.cpp
index a71bcf8f8..c0f3e945c 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.cpp
+++ b/cockatrice/src/client/network/update/client/update_downloader.cpp
@@ -10,9 +10,8 @@ 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);
@@ -22,9 +21,8 @@ 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 9a0caccbc..d70759038 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.h
+++ b/cockatrice/src/client/network/update/client/update_downloader.h
@@ -1,8 +1,8 @@
 /**
  * @file update_downloader.h
  * @ingroup ClientUpdate
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COCKATRICE_UPDATEDOWNLOADER_H
 #define COCKATRICE_UPDATEDOWNLOADER_H
diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp
index 73e5a98a1..a66897b4a 100644
--- a/cockatrice/src/client/settings/cache_settings.cpp
+++ b/cockatrice/src/client/settings/cache_settings.cpp
@@ -1,7 +1,5 @@
 #include "cache_settings.h"
 
-#include "../../interface/card_picture_loader/card_picture_loader_cache_method.h"
-#include "../../interface/card_picture_loader/card_picture_loader_local_schemes.h"
 #include "../network/update/client/release_channel.h"
 #include "card_counter_settings.h"
 #include "version_string.h"
@@ -26,11 +24,10 @@ SettingsCache &SettingsCache::instance()
 
 QString SettingsCache::getDataPath()
 {
-    if (isPortableBuild) {
+    if (isPortableBuild)
         return qApp->applicationDirPath() + "/data";
-    } else {
+    else
         return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
-    }
 }
 
 QString SettingsCache::getSettingsPath()
@@ -40,11 +37,10 @@ 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
@@ -54,17 +50,14 @@ QString SettingsCache::getNetworkCachePath() const
 
 void SettingsCache::translateLegacySettings()
 {
-    if (isPortableBuild) {
+    if (isPortableBuild)
         return;
-    }
 
     // Layouts
     QFile layoutFile(getSettingsPath() + "layouts/deckLayout.ini");
-    if (layoutFile.exists()) {
-        if (layoutFile.copy(getSettingsPath() + "layouts.ini")) {
+    if (layoutFile.exists())
+        if (layoutFile.copy(getSettingsPath() + "layouts.ini"))
             layoutFile.remove();
-        }
-    }
 
     QStringList usedKeys;
     QSettings legacySetting;
@@ -123,11 +116,10 @@ void SettingsCache::translateLegacySettings()
     gameFilters().setHideIgnoredUserGames(legacySetting.value("hide_ignored_user_games").toBool());
     gameFilters().setMinPlayers(legacySetting.value("min_players").toInt());
 
-    if (legacySetting.value("max_players").toInt() > 1) {
+    if (legacySetting.value("max_players").toInt() > 1)
         gameFilters().setMaxPlayers(legacySetting.value("max_players").toInt());
-    } else {
+    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) {
@@ -143,9 +135,8 @@ void SettingsCache::translateLegacySettings()
 
     QStringList allLegacyKeys = legacySetting.allKeys();
     for (int i = 0; i < allLegacyKeys.size(); ++i) {
-        if (usedKeys.contains(allLegacyKeys.at(i))) {
+        if (usedKeys.contains(allLegacyKeys.at(i)))
             continue;
-        }
         settings->setValue(allLegacyKeys.at(i), legacySetting.value(allLegacyKeys.at(i)));
     }
 }
@@ -156,9 +147,8 @@ QString SettingsCache::getSafeConfigPath(QString configEntry, QString defaultPat
     // 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;
@@ -169,9 +159,8 @@ 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;
 }
 
@@ -179,9 +168,8 @@ 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");
@@ -201,9 +189,8 @@ SettingsCache::SettingsCache()
 
     cardCounterSettings = new CardCounterSettings(settingsPath, this);
 
-    if (!QFile(settingsPath + "global.ini").exists()) {
+    if (!QFile(settingsPath + "global.ini").exists())
         translateLegacySettings();
-    }
 
     // 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.
@@ -224,7 +211,6 @@ SettingsCache::SettingsCache()
     startupCardUpdateCheckAlwaysUpdate = settings->value("personal/startupCardUpdateCheckAlwaysUpdate", false).toBool();
     cardUpdateCheckInterval = settings->value("personal/cardUpdateCheckInterval", 7).toInt();
     lastCardUpdateCheck = settings->value("personal/lastCardUpdateCheck", QDateTime::currentDateTime().date()).toDate();
-    alwaysEnableNewSets = settings->value("personal/alwaysEnableNewSets", false).toBool();
     notifyAboutUpdates = settings->value("personal/updatenotification", true).toBool();
     notifyAboutNewVersion = settings->value("personal/newversionnotification", true).toBool();
 
@@ -270,26 +256,14 @@ SettingsCache::SettingsCache()
         settings->setValue("personal/pixmapCacheSize", pixmapCacheSize);
         settings->setValue("personal/picturedownloadhq", false);
         settings->setValue("revert/pixmapCacheSize", true);
-    } else {
+    } else
         pixmapCacheSize = settings->value("personal/pixmapCacheSize", PIXMAPCACHE_SIZE_DEFAULT).toInt();
-    }
     // sanity check
-    if (pixmapCacheSize < PIXMAPCACHE_SIZE_MIN || pixmapCacheSize > PIXMAPCACHE_SIZE_MAX) {
+    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();
-    cardPictureLoaderCacheMethod =
-        settings
-            ->value("personal/cardPictureLoaderCacheMethod",
-                    static_cast<int>(CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE))
-            .toInt();
-    localCardImageStorageNamingScheme =
-        settings
-            ->value("personal/localCardImageStorageNamingScheme",
-                    static_cast<int>(CardPictureLoaderLocalSchemes::NamingScheme::Set_Folder_Name_Set_Collector))
-            .toInt();
 
     picDownload = settings->value("personal/picturedownload", true).toBool();
     showStatusBar = settings->value("personal/showStatusBar", false).toBool();
@@ -388,7 +362,6 @@ SettingsCache::SettingsCache()
 
     ignoreUnregisteredUsers = settings->value("chat/ignore_unregistered", false).toBool();
     ignoreUnregisteredUserMessages = settings->value("chat/ignore_unregistered_messages", false).toBool();
-    ignoreNonBuddyUserMessages = settings->value("chat/ignore_nonbuddy_messages", false).toBool();
 
     scaleCards = settings->value("cards/scaleCards", true).toBool();
     verticalCardOverlapPercent = settings->value("cards/verticalCardOverlapPercent", 33).toInt();
@@ -796,9 +769,8 @@ void SettingsCache::setPrintingSelectorCardSize(int _printingSelectorCardSize)
 
 void SettingsCache::setIncludeRebalancedCards(bool _includeRebalancedCards)
 {
-    if (includeRebalancedCards == _includeRebalancedCards) {
+    if (includeRebalancedCards == _includeRebalancedCards)
         return;
-    }
 
     includeRebalancedCards = _includeRebalancedCards;
     settings->setValue("cards/includerebalancedcards", includeRebalancedCards);
@@ -1118,12 +1090,6 @@ void SettingsCache::setIgnoreUnregisteredUserMessages(QT_STATE_CHANGED_T _ignore
     settings->setValue("chat/ignore_unregistered_messages", ignoreUnregisteredUserMessages);
 }
 
-void SettingsCache::setIgnoreNonBuddyUserMessages(QT_STATE_CHANGED_T _ignoreNonBuddyUserMessages)
-{
-    ignoreNonBuddyUserMessages = static_cast<bool>(_ignoreNonBuddyUserMessages);
-    settings->setValue("chat/ignore_nonbuddy_messages", ignoreNonBuddyUserMessages);
-}
-
 void SettingsCache::setPixmapCacheSize(const int _pixmapCacheSize)
 {
     pixmapCacheSize = _pixmapCacheSize;
@@ -1131,13 +1097,6 @@ void SettingsCache::setPixmapCacheSize(const int _pixmapCacheSize)
     emit pixmapCacheSizeChanged(pixmapCacheSize);
 }
 
-void SettingsCache::setCardImageCacheMethod(const CardPictureLoaderCacheMethod::CacheMethod _cardImageCachingMethod)
-{
-    cardPictureLoaderCacheMethod = static_cast<int>(_cardImageCachingMethod);
-    settings->setValue("personal/cardPictureLoaderCacheMethod", cardPictureLoaderCacheMethod);
-    emit cardPictureLoaderCacheMethodChanged(cardPictureLoaderCacheMethod);
-}
-
 void SettingsCache::setNetworkCacheSizeInMB(const int _networkCacheSize)
 {
     networkCacheSize = _networkCacheSize;
@@ -1152,14 +1111,6 @@ void SettingsCache::setNetworkRedirectCacheTtl(const int _redirectCacheTtl)
     emit redirectCacheTtlChanged(redirectCacheTtl);
 }
 
-void SettingsCache::setLocalCardImageStorageNamingScheme(
-    const CardPictureLoaderLocalSchemes::NamingScheme _localCardImageStorageNamingScheme)
-{
-    localCardImageStorageNamingScheme = static_cast<int>(_localCardImageStorageNamingScheme);
-    settings->setValue("personal/localCardImageStorageNamingScheme", localCardImageStorageNamingScheme);
-    emit localCardImageStorageNamingSchemeChanged(localCardImageStorageNamingScheme);
-}
-
 void SettingsCache::setClientID(const QString &_clientID)
 {
     clientID = _clientID;
@@ -1295,12 +1246,6 @@ void SettingsCache::setLastCardUpdateCheck(QDate value)
     settings->setValue("personal/lastCardUpdateCheck", lastCardUpdateCheck);
 }
 
-void SettingsCache::setAlwaysEnableNewSets(bool value)
-{
-    alwaysEnableNewSets = value;
-    settings->setValue("personal/alwaysEnableNewSets", alwaysEnableNewSets);
-}
-
 void SettingsCache::setRememberGameSettings(const bool _rememberGameSettings)
 {
     rememberGameSettings = _rememberGameSettings;
@@ -1358,9 +1303,8 @@ void SettingsCache::setMaxFontSize(int _max)
 
 void SettingsCache::setRoundCardCorners(bool _roundCardCorners)
 {
-    if (_roundCardCorners == roundCardCorners) {
+    if (_roundCardCorners == roundCardCorners)
         return;
-    }
 
     roundCardCorners = _roundCardCorners;
     settings->setValue("cards/roundcardcorners", _roundCardCorners);
diff --git a/cockatrice/src/client/settings/cache_settings.h b/cockatrice/src/client/settings/cache_settings.h
index 8ee372766..ece61487f 100644
--- a/cockatrice/src/client/settings/cache_settings.h
+++ b/cockatrice/src/client/settings/cache_settings.h
@@ -1,14 +1,12 @@
 /**
  * @file cache_settings.h
  * @ingroup Settings
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef SETTINGSCACHE_H
 #define SETTINGSCACHE_H
 
-#include "../../interface/card_picture_loader/card_picture_loader_cache_method.h"
-#include "../../interface/card_picture_loader/card_picture_loader_local_schemes.h"
 #include "shortcuts_settings.h"
 
 #include <QDate>
@@ -183,12 +181,9 @@ signals:
     void soundThemeChanged();
     void ignoreUnregisteredUsersChanged();
     void ignoreUnregisteredUserMessagesChanged();
-    void ignoreNonBuddyUserMessagesChanged();
     void pixmapCacheSizeChanged(int newSizeInMBs);
     void networkCacheSizeChanged(int newSizeInMBs);
     void redirectCacheTtlChanged(int newTtl);
-    void cardPictureLoaderCacheMethodChanged(int cardPictureLoaderCacheMethod);
-    void localCardImageStorageNamingSchemeChanged(int localCardImageStorageNamingScheme);
     void masterVolumeChanged(int value);
     void chatMentionCompleterChanged();
     void downloadSpoilerTimeIndexChanged();
@@ -221,7 +216,6 @@ private:
     bool checkCardUpdatesOnStartup;
     int cardUpdateCheckInterval;
     QDate lastCardUpdateCheck;
-    bool alwaysEnableNewSets;
     bool notifyAboutUpdates;
     bool notifyAboutNewVersion;
     bool showTipsOnStartup;
@@ -295,7 +289,6 @@ private:
     QString soundThemeName;
     bool ignoreUnregisteredUsers;
     bool ignoreUnregisteredUserMessages;
-    bool ignoreNonBuddyUserMessages;
     QString picUrl;
     QString picUrlFallback;
     QString clientID;
@@ -309,8 +302,6 @@ private:
     int pixmapCacheSize;
     int networkCacheSize;
     int redirectCacheTtl;
-    int cardPictureLoaderCacheMethod;
-    int localCardImageStorageNamingScheme;
     bool scaleCards;
     int verticalCardOverlapPercent;
     bool showMessagePopups;
@@ -511,10 +502,6 @@ public:
         return getLastCardUpdateCheck().daysTo(QDateTime::currentDateTime().date()) >= getCardUpdateCheckInterval() &&
                getLastCardUpdateCheck() != QDateTime::currentDateTime().date();
     }
-    [[nodiscard]] bool getAlwaysEnableNewSets() const
-    {
-        return alwaysEnableNewSets;
-    }
     [[nodiscard]] bool getNotifyAboutUpdates() const override
     {
         return notifyAboutUpdates;
@@ -790,18 +777,10 @@ public:
     {
         return ignoreUnregisteredUserMessages;
     }
-    [[nodiscard]] bool getIgnoreNonBuddyUserMessages() const
-    {
-        return ignoreNonBuddyUserMessages;
-    }
     [[nodiscard]] int getPixmapCacheSize() const
     {
         return pixmapCacheSize;
     }
-    [[nodiscard]] CardPictureLoaderCacheMethod::CacheMethod getCardPictureLoaderCacheMethod() const
-    {
-        return static_cast<CardPictureLoaderCacheMethod::CacheMethod>(cardPictureLoaderCacheMethod);
-    }
     [[nodiscard]] int getNetworkCacheSizeInMB() const
     {
         return networkCacheSize;
@@ -810,10 +789,6 @@ public:
     {
         return redirectCacheTtl;
     }
-    [[nodiscard]] CardPictureLoaderLocalSchemes::NamingScheme getLocalCardImageStorageNamingScheme() const
-    {
-        return static_cast<CardPictureLoaderLocalSchemes::NamingScheme>(localCardImageStorageNamingScheme);
-    }
     [[nodiscard]] bool getScaleCards() const
     {
         return scaleCards;
@@ -1117,13 +1092,9 @@ public slots:
     void setSoundThemeName(const QString &_soundThemeName);
     void setIgnoreUnregisteredUsers(QT_STATE_CHANGED_T _ignoreUnregisteredUsers);
     void setIgnoreUnregisteredUserMessages(QT_STATE_CHANGED_T _ignoreUnregisteredUserMessages);
-    void setIgnoreNonBuddyUserMessages(QT_STATE_CHANGED_T _ignoreNonBuddyUserMessages);
     void setPixmapCacheSize(const int _pixmapCacheSize);
-    void setCardImageCacheMethod(CardPictureLoaderCacheMethod::CacheMethod _cardImageCachingMethod);
     void setNetworkCacheSizeInMB(const int _networkCacheSize);
     void setNetworkRedirectCacheTtl(const int _redirectCacheTtl);
-    void setLocalCardImageStorageNamingScheme(
-        const CardPictureLoaderLocalSchemes::NamingScheme _localCardImageStorageNamingScheme);
     void setCardScaling(const QT_STATE_CHANGED_T _scaleCards);
     void setStackCardOverlapPercent(const int _verticalCardOverlapPercent);
     void setShowMessagePopups(const QT_STATE_CHANGED_T _showMessagePopups);
@@ -1154,7 +1125,6 @@ public slots:
     void setStartupCardUpdateCheckAlwaysUpdate(bool value);
     void setCardUpdateCheckInterval(int value);
     void setLastCardUpdateCheck(QDate value);
-    void setAlwaysEnableNewSets(bool value);
     void setNotifyAboutUpdate(QT_STATE_CHANGED_T _notifyaboutupdate);
     void setNotifyAboutNewVersion(QT_STATE_CHANGED_T _notifyaboutnewversion);
     void setUpdateReleaseChannelIndex(int value);
diff --git a/cockatrice/src/client/settings/card_counter_settings.cpp b/cockatrice/src/client/settings/card_counter_settings.cpp
index 662ae0c7d..71ce4cfc6 100644
--- a/cockatrice/src/client/settings/card_counter_settings.cpp
+++ b/cockatrice/src/client/settings/card_counter_settings.cpp
@@ -11,13 +11,10 @@ CardCounterSettings::CardCounterSettings(const QString &settingsPath, QObject *p
 
 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);
@@ -39,7 +36,7 @@ QColor CardCounterSettings::color(int counterId) const
         defaultColor = QColor::fromHsv(h, s, v);
     }
 
-    return getSettings().value(QString("cards/counters/%1/color").arg(counterId), defaultColor).value<QColor>();
+    return settings.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 2ac658177..b1d467d67 100644
--- a/cockatrice/src/client/settings/card_counter_settings.h
+++ b/cockatrice/src/client/settings/card_counter_settings.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/client/settings/shortcut_treeview.h b/cockatrice/src/client/settings/shortcut_treeview.h
index afaf7e7ed..8d74a6f1e 100644
--- a/cockatrice/src/client/settings/shortcut_treeview.h
+++ b/cockatrice/src/client/settings/shortcut_treeview.h
@@ -1,8 +1,8 @@
 /**
  * @file shortcut_treeview.h
  * @ingroup CoreSettings
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef SHORTCUT_TREEVIEW_H
 #define SHORTCUT_TREEVIEW_H
diff --git a/cockatrice/src/client/settings/shortcuts_settings.cpp b/cockatrice/src/client/settings/shortcuts_settings.cpp
index 2ff65ab6f..53c6f6a23 100644
--- a/cockatrice/src/client/settings/shortcuts_settings.cpp
+++ b/cockatrice/src/client/settings/shortcuts_settings.cpp
@@ -64,13 +64,8 @@ ShortcutsSettings::ShortcutsSettings(const QString &settingsPath, QObject *paren
     }
 }
 
-/**
- * @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.
- */
+/// 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.
 void ShortcutsSettings::migrateShortcuts()
 {
     if (QFile(settingsFilePath).exists()) {
@@ -241,7 +236,9 @@ bool ShortcutsSettings::isValid(const QString &name, const QString &sequences) c
     return findOverlaps(name, sequences).isEmpty();
 }
 
-/** @brief Checks if the shortcut is a shortcut that is active in all windows. */
+/**
+ * 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 45e2c4fca..47332b8c4 100644
--- a/cockatrice/src/client/settings/shortcuts_settings.h
+++ b/cockatrice/src/client/settings/shortcuts_settings.h
@@ -1,8 +1,8 @@
 /**
  * @file shortcuts_settings.h
  * @ingroup CoreSettings
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef SHORTCUTSSETTINGS_H
 #define SHORTCUTSSETTINGS_H
@@ -501,7 +501,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 Skip Untapping"),
+        {"Player/aDoesntUntap", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle Untap"),
                                             parseSequenceString("Alt+U"),
                                             ShortcutGroup::Playing_Area)},
         {"Player/aFlip", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Turn Card Over"),
@@ -513,9 +513,6 @@ 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)},
@@ -537,9 +534,6 @@ 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)},
@@ -566,9 +560,12 @@ private:
         {"Player/aMoveToTopLibrary", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Top of Library"),
                                                  parseSequenceString(""),
                                                  ShortcutGroup::Move_selected)},
-        {"Player/aMoveToTable", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield"),
-                                            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/aViewHand",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Hand"), parseSequenceString(""), ShortcutGroup::View)},
         {"Player/aViewGraveyard",
@@ -667,9 +664,6 @@ 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)},
diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp
index e592b5ea0..31cb2a35e 100644
--- a/cockatrice/src/client/sound_engine.cpp
+++ b/cockatrice/src/client/sound_engine.cpp
@@ -105,9 +105,8 @@ QStringMap &SoundEngine::getAvailableThemes()
     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
@@ -122,9 +121,8 @@ 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;
diff --git a/cockatrice/src/client/sound_engine.h b/cockatrice/src/client/sound_engine.h
index 0c201523a..f45cccf7d 100644
--- a/cockatrice/src/client/sound_engine.h
+++ b/cockatrice/src/client/sound_engine.h
@@ -1,8 +1,8 @@
 /**
  * @file sound_engine.h
  * @ingroup Core
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef SOUNDENGINE_H
 #define SOUNDENGINE_H
diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp
index dd873cfa5..6b671831d 100644
--- a/cockatrice/src/filters/deck_filter_string.cpp
+++ b/cockatrice/src/filters/deck_filter_string.cpp
@@ -88,27 +88,20 @@ 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; };
     };
 
diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h
index 916b629ee..1b43d770d 100644
--- a/cockatrice/src/filters/deck_filter_string.h
+++ b/cockatrice/src/filters/deck_filter_string.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp
index 785f753e7..7178ce95a 100644
--- a/cockatrice/src/filters/filter_builder.cpp
+++ b/cockatrice/src/filters/filter_builder.cpp
@@ -11,15 +11,13 @@ 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());
     ok->setObjectName("ok");
@@ -55,9 +53,8 @@ FilterBuilder::~FilterBuilder()
 
 void FilterBuilder::destroyFilter()
 {
-    if (fltr) {
+    if (fltr)
         delete fltr;
-    }
 }
 
 static int comboCurrentIntData(const QComboBox *combo)
@@ -70,9 +67,8 @@ 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 98fe3fd02..74872e3cd 100644
--- a/cockatrice/src/filters/filter_builder.h
+++ b/cockatrice/src/filters/filter_builder.h
@@ -1,8 +1,8 @@
 /**
  * @file filter_builder.h
  * @ingroup CardDatabaseModelFilters
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef FILTERBUILDER_H
 #define FILTERBUILDER_H
diff --git a/cockatrice/src/filters/filter_tree_model.cpp b/cockatrice/src/filters/filter_tree_model.cpp
index 33b54530e..f0a02ec79 100644
--- a/cockatrice/src/filters/filter_tree_model.cpp
+++ b/cockatrice/src/filters/filter_tree_model.cpp
@@ -23,9 +23,8 @@ 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)
@@ -33,9 +32,8 @@ 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)
@@ -43,9 +41,8 @@ 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)
@@ -53,9 +50,8 @@ 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
@@ -63,14 +59,12 @@ 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;
@@ -151,16 +145,14 @@ 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;
 }
@@ -174,17 +166,14 @@ 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:
@@ -201,11 +190,10 @@ 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();
     }
@@ -217,27 +205,22 @@ 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;
@@ -248,19 +231,16 @@ 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;
@@ -272,9 +252,8 @@ 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);
@@ -284,14 +263,12 @@ 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);
 }
@@ -302,21 +279,18 @@ 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;
     }
@@ -330,22 +304,18 @@ 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 7452f7a61..c6666a838 100644
--- a/cockatrice/src/filters/filter_tree_model.h
+++ b/cockatrice/src/filters/filter_tree_model.h
@@ -1,8 +1,8 @@
 /**
  * @file filter_tree_model.h
  * @ingroup CardDatabaseModelFilters
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef FILTERTREEMODEL_H
 #define FILTERTREEMODEL_H
diff --git a/cockatrice/src/filters/syntax_help.h b/cockatrice/src/filters/syntax_help.h
index d06fe03e5..7e5ef3e0e 100644
--- a/cockatrice/src/filters/syntax_help.h
+++ b/cockatrice/src/filters/syntax_help.h
@@ -2,8 +2,8 @@
  * @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
diff --git a/cockatrice/src/game/abstract_game.cpp b/cockatrice/src/game/abstract_game.cpp
index c20003ece..505cd5fde 100644
--- a/cockatrice/src/game/abstract_game.cpp
+++ b/cockatrice/src/game/abstract_game.cpp
@@ -1,9 +1,8 @@
 #include "abstract_game.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
-#include "player/player_logic.h"
+#include "player/player.h"
 
-AbstractGame::AbstractGame(QObject *_parent) : QObject(_parent)
+AbstractGame::AbstractGame(TabGame *_tab) : tab(_tab)
 {
     gameMetaInfo = new GameMetaInfo(this);
     gameEventHandler = new GameEventHandler(this);
@@ -24,11 +23,10 @@ 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)
@@ -44,15 +42,13 @@ void AbstractGame::setActiveCard(CardItem *card)
 
 CardItem *AbstractGame::getCard(int playerId, const QString &zoneName, int cardId) const
 {
-    PlayerLogic *player = playerManager->getPlayer(playerId);
-    if (!player) {
+    Player *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 5115ed5ca..cb4dbac2a 100644
--- a/cockatrice/src/game/abstract_game.h
+++ b/cockatrice/src/game/abstract_game.h
@@ -1,8 +1,8 @@
 /**
  * @file abstract_game.h
  * @ingroup GameLogic
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COCKATRICE_ABSTRACT_GAME_H
 #define COCKATRICE_ABSTRACT_GAME_H
@@ -16,19 +16,26 @@
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 
 class CardItem;
+class TabGame;
 class AbstractGame : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit AbstractGame(QObject *parent);
+    explicit AbstractGame(TabGame *tab);
 
+    TabGame *tab;
     GameMetaInfo *gameMetaInfo;
     GameState *gameState;
     GameEventHandler *gameEventHandler;
     PlayerManager *playerManager;
     CardItem *activeCard;
 
+    TabGame *getTab() const
+    {
+        return tab;
+    }
+
     GameMetaInfo *getGameMetaInfo()
     {
         return gameMetaInfo;
diff --git a/cockatrice/src/game/arrow_registry.cpp b/cockatrice/src/game/arrow_registry.cpp
deleted file mode 100644
index 286764b3b..000000000
--- a/cockatrice/src/game/arrow_registry.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "arrow_registry.h"
-
-#include "../game_graphics/board/arrow_item.h"
-
-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
deleted file mode 100644
index ef98229a2..000000000
--- a/cockatrice/src/game/arrow_registry.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef COCKATRICE_ARROW_REGISTRY_H
-#define COCKATRICE_ARROW_REGISTRY_H
-
-#include "board/arrow_data.h"
-
-#include <QMap>
-#include <QSet>
-#include <QSharedPointer>
-
-class ArrowItem;
-
-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_graphics/board/abstract_card_drag_item.cpp b/cockatrice/src/game/board/abstract_card_drag_item.cpp
similarity index 98%
rename from cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
rename to cockatrice/src/game/board/abstract_card_drag_item.cpp
index 026efd60d..8e3def4ca 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
+++ b/cockatrice/src/game/board/abstract_card_drag_item.cpp
@@ -25,12 +25,11 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
         setCursor(Qt::ClosedHandCursor);
         setZValue(ZValues::DRAG_ITEM);
     }
-    if (item->getTapped()) {
+    if (item->getTapped())
         setTransform(QTransform()
                          .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
                          .rotate(90)
                          .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
-    }
 
     setCacheMode(DeviceCoordinateCache);
 
diff --git a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h b/cockatrice/src/game/board/abstract_card_drag_item.h
similarity index 97%
rename from cockatrice/src/game_graphics/board/abstract_card_drag_item.h
rename to cockatrice/src/game/board/abstract_card_drag_item.h
index 1cbeb4fe7..fe3b87983 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
+++ b/cockatrice/src/game/board/abstract_card_drag_item.h
@@ -1,8 +1,8 @@
 /**
  * @file abstract_card_drag_item.h
  * @ingroup GameGraphicsCards
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef ABSTRACTCARDDRAGITEM_H
 #define ABSTRACTCARDDRAGITEM_H
diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp
similarity index 90%
rename from cockatrice/src/game_graphics/board/abstract_card_item.cpp
rename to cockatrice/src/game/board/abstract_card_item.cpp
index 86b3e27c8..9ec6ada9a 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_item.cpp
+++ b/cockatrice/src/game/board/abstract_card_item.cpp
@@ -13,7 +13,7 @@
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 
-AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, PlayerLogic *_owner, int _id)
+AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, Player *_owner, int _id)
     : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0),
       bgColor(Qt::transparent), isHovered(false), realZValue(0)
 {
@@ -85,12 +85,7 @@ const CardInfo &AbstractCardItem::getCardInfo() const
 void AbstractCardItem::setRealZValue(qreal _zValue)
 {
     realZValue = _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);
-    }
+    setZValue(_zValue);
 }
 
 QSizeF AbstractCardItem::getTranslatedSize(QPainter *painter) const
@@ -131,9 +126,8 @@ 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;
         }
@@ -158,9 +152,9 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
         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) + " ";
@@ -187,12 +181,10 @@ 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());
@@ -218,20 +210,11 @@ 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 ? ZValues::HOVERED_CARD : realZValue);
     setScale(_hovered && SettingsCache::instance().getScaleCards() ? 1.1 : 1);
@@ -282,14 +265,13 @@ 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().getTapAnimation() && canAnimate)
         static_cast<GameScene *>(scene())->registerAnimationItem(this);
-    } else {
+    else {
         tapAngle = tapped ? 90 : 0;
         setTransform(QTransform()
                          .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
@@ -315,19 +297,17 @@ 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();
@@ -343,7 +323,6 @@ 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_graphics/board/abstract_card_item.h b/cockatrice/src/game/board/abstract_card_item.h
similarity index 83%
rename from cockatrice/src/game_graphics/board/abstract_card_item.h
rename to cockatrice/src/game/board/abstract_card_item.h
index bdb5f7cf1..7d2c29cae 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_item.h
+++ b/cockatrice/src/game/board/abstract_card_item.h
@@ -1,20 +1,20 @@
 /**
  * @file abstract_card_item.h
  * @ingroup GameGraphicsCards
- * @brief Base class for graphical card items, providing shared rendering, identity, and interaction logic.
+ * @brief TODO: Document this.
  */
 
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
+#include "../../game_graphics/board/graphics_item_type.h"
 #include "../card_dimensions.h"
 #include "arrow_target.h"
-#include "graphics_item_type.h"
 
 #include <libcockatrice/card/printing/exact_card.h>
 #include <libcockatrice/utility/card_ref.h>
 
-class PlayerLogic;
+class Player;
 
 class AbstractCardItem : public ArrowTarget
 {
@@ -44,11 +44,6 @@ 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
@@ -61,7 +56,7 @@ public:
     }
     explicit AbstractCardItem(QGraphicsItem *parent = nullptr,
                               const CardRef &cardRef = {},
-                              PlayerLogic *_owner = nullptr,
+                              Player *_owner = nullptr,
                               int _id = -1);
     ~AbstractCardItem() override;
     QRectF boundingRect() const override;
@@ -101,10 +96,6 @@ public:
     }
     void setRealZValue(qreal _zValue);
     void setHovered(bool _hovered);
-    bool getIsHovered() const
-    {
-        return isHovered;
-    }
     QString getColor() const
     {
         return color;
diff --git a/cockatrice/src/game_graphics/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp
similarity index 55%
rename from cockatrice/src/game_graphics/board/abstract_counter.cpp
rename to cockatrice/src/game/board/abstract_counter.cpp
index 219dd456e..08d19ec8a 100644
--- a/cockatrice/src/game_graphics/board/abstract_counter.cpp
+++ b/cockatrice/src/game/board/abstract_counter.cpp
@@ -1,15 +1,14 @@
 #include "abstract_counter.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../../game_graphics/board/translate_counter_name.h"
 #include "../../interface/widgets/tabs/tab_game.h"
+#include "../player/player.h"
+#include "../player/player_actions.h"
+#include "translate_counter_name.h"
 
 #include <QAction>
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
-#include <QGraphicsView>
 #include <QKeyEvent>
 #include <QMenu>
 #include <QString>
@@ -17,24 +16,24 @@
 #include <libcockatrice/protocol/pb/command_set_counter.pb.h>
 #include <libcockatrice/utility/expression.h>
 
-AbstractCounter::AbstractCounter(CounterState *state,
-                                 PlayerLogic *_player,
+AbstractCounter::AbstractCounter(Player *_player,
+                                 int _id,
+                                 const QString &_name,
                                  bool _shownInCounterArea,
+                                 int _value,
                                  bool _useNameForShortcut,
                                  QGraphicsItem *parent)
-    : QGraphicsItem(parent), player(_player), id(state->getId()), name(state->getName()), value(state->getValue()),
-      color(state->getColor()), radius(state->getRadius()), useNameForShortcut(_useNameForShortcut),
-      shownInCounterArea(_shownInCounterArea)
+    : QGraphicsItem(parent), player(_player), id(_id), name(_name), value(_value),
+      useNameForShortcut(_useNameForShortcut), hovered(false), aDec(nullptr), aInc(nullptr), dialogSemaphore(false),
+      deleteAfterDialog(false), shownInCounterArea(_shownInCounterArea)
 {
     setAcceptHoverEvents(true);
 
-    connect(state, &CounterState::valueChanged, this, [this](int, int newValue) {
-        value = newValue;
-        update();
-    });
+    shortcutActive = false;
 
     if (player->getPlayerInfo()->getLocalOrJudge()) {
-        menu = new TearOffMenu(TranslateCounterName::getDisplayName(state->getName()));
+        QString displayName = TranslateCounterName::getDisplayName(_name);
+        menu = new TearOffMenu(displayName);
         aSet = new QAction(this);
         connect(aSet, &QAction::triggered, this, &AbstractCounter::setCounter);
         menu->addAction(aSet);
@@ -42,18 +41,16 @@ AbstractCounter::AbstractCounter(CounterState *state,
         for (int i = 10; i >= -10; --i) {
             if (i == 0) {
                 menu->addSeparator();
-                continue;
+            } 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);
             }
-            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;
@@ -72,35 +69,39 @@ AbstractCounter::~AbstractCounter()
 
 void AbstractCounter::delCounter()
 {
-    if (dialogSemaphore) {
+    if (dialogSemaphore)
         deleteAfterDialog = true;
-    } else {
+    else
         deleteLater();
-    }
 }
 
 void AbstractCounter::retranslateUi()
 {
-    if (aSet) {
+    if (menu) {
         aSet->setText(tr("&Set counter..."));
     }
 }
 
 void AbstractCounter::setShortcutsActive()
 {
-    if (!menu || !player->getPlayerInfo()->getLocal()) {
+    if (!menu) {
         return;
     }
-    ShortcutsSettings &sc = SettingsCache::instance().shortcuts();
-    shortcutActive = true;
+    if (!player->getPlayerInfo()->getLocal()) {
+        return;
+    }
+
+    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
     if (name == "life") {
-        aSet->setShortcuts(sc.getShortcut("Player/aSet"));
-        aDec->setShortcuts(sc.getShortcut("Player/aDec"));
-        aInc->setShortcuts(sc.getShortcut("Player/aInc"));
+        shortcutActive = true;
+        aSet->setShortcuts(shortcuts.getShortcut("Player/aSet"));
+        aDec->setShortcuts(shortcuts.getShortcut("Player/aDec"));
+        aInc->setShortcuts(shortcuts.getShortcut("Player/aInc"));
     } else if (useNameForShortcut) {
-        aSet->setShortcuts(sc.getShortcut("Player/aSetCounter_" + name));
-        aDec->setShortcuts(sc.getShortcut("Player/aDecCounter_" + name));
-        aInc->setShortcuts(sc.getShortcut("Player/aIncCounter_" + name));
+        shortcutActive = true;
+        aSet->setShortcuts(shortcuts.getShortcut("Player/aSetCounter_" + name));
+        aDec->setShortcuts(shortcuts.getShortcut("Player/aDecCounter_" + name));
+        aInc->setShortcuts(shortcuts.getShortcut("Player/aIncCounter_" + name));
     }
 }
 
@@ -125,32 +126,43 @@ void AbstractCounter::refreshShortcuts()
     }
 }
 
-void AbstractCounter::mousePressEvent(QGraphicsSceneMouseEvent *event)
+void AbstractCounter::setValue(int _value)
 {
-    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();
+    value = _value;
+    update();
 }
 
-void AbstractCounter::hoverEnterEvent(QGraphicsSceneHoverEvent *)
+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
+        event->ignore();
+}
+
+void AbstractCounter::hoverEnterEvent(QGraphicsSceneHoverEvent * /*event*/)
 {
     hovered = true;
     update();
 }
-void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent *)
+
+void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent * /*event*/)
 {
     hovered = false;
     update();
@@ -158,36 +170,34 @@ void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent *)
 
 void AbstractCounter::incrementCounter()
 {
+    const int delta = static_cast<QAction *>(sender())->data().toInt();
     Command_IncCounter cmd;
     cmd.set_counter_id(id);
-    cmd.set_delta(static_cast<QAction *>(sender())->data().toInt());
+    cmd.set_delta(delta);
     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 dlg(name, QString::number(value), parent);
-    const int ok = dlg.exec();
-    dialogSemaphore = false;
+    AbstractCounterDialog dialog(name, QString::number(value), player->getGame()->getTab());
+    const int ok = dialog.exec();
 
     if (deleteAfterDialog) {
         deleteLater();
         return;
     }
-    if (!ok) {
+    dialogSemaphore = false;
+
+    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(static_cast<int>(exp.parse(dlg.textValue())));
+    cmd.set_value(newValue);
     player->getPlayerActions()->sendGameCommand(cmd);
 }
 
@@ -221,9 +231,8 @@ void AbstractCounterDialog::changeValue(int diff)
 {
     bool ok;
     int curValue = textValue().toInt(&ok);
-    if (!ok) {
+    if (!ok)
         return;
-    }
     curValue += diff;
     setTextValue(QString::number(curValue));
 }
diff --git a/cockatrice/src/game_graphics/board/abstract_counter.h b/cockatrice/src/game/board/abstract_counter.h
similarity index 59%
rename from cockatrice/src/game_graphics/board/abstract_counter.h
rename to cockatrice/src/game/board/abstract_counter.h
index b319a722d..ea13cb00f 100644
--- a/cockatrice/src/game_graphics/board/abstract_counter.h
+++ b/cockatrice/src/game/board/abstract_counter.h
@@ -1,51 +1,45 @@
 /**
  * @file abstract_counter.h
  * @ingroup GameGraphicsPlayers
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COUNTER_H
 #define COUNTER_H
 
-#include "../../game/board/counter_state.h"
 #include "../../interface/widgets/menus/tearoff_menu.h"
-#include "../player/menu/abstract_player_component.h"
 
 #include <QGraphicsItem>
 #include <QInputDialog>
 
-class PlayerLogic;
+class Player;
 class QAction;
 class QKeyEvent;
 class QMenu;
 class QString;
 
-class AbstractCounter : public QObject, public QGraphicsItem, public AbstractPlayerComponent
+class AbstractCounter : public QObject, public QGraphicsItem
 {
     Q_OBJECT
     Q_INTERFACES(QGraphicsItem)
 
 protected:
-    PlayerLogic *player;
+    Player *player;
     int id;
     QString name;
     int value;
-    QColor color;
-    int radius;
-    bool hovered = false;
-    bool useNameForShortcut;
+    bool useNameForShortcut, hovered;
 
     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;
+    QAction *aSet, *aDec, *aInc;
+    TearOffMenu *menu;
+    bool dialogSemaphore, deleteAfterDialog;
     bool shownInCounterArea;
-    bool shortcutActive = false;
+    bool shortcutActive;
 
 private slots:
     void refreshShortcuts();
@@ -53,22 +47,26 @@ private slots:
     void setCounter();
 
 public:
-    AbstractCounter(CounterState *state,
-                    PlayerLogic *player,
-                    bool shownInCounterArea,
-                    bool useNameForShortcut = false,
+    AbstractCounter(Player *_player,
+                    int _id,
+                    const QString &_name,
+                    bool _shownInCounterArea,
+                    int _value,
+                    bool _useNameForShortcut = false,
                     QGraphicsItem *parent = nullptr);
     ~AbstractCounter() override;
 
-    void retranslateUi() override;
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
+    void retranslateUi();
+    void setValue(int _value);
+    void setShortcutsActive();
+    void setShortcutsInactive();
     void delCounter();
 
     QMenu *getMenu() const
     {
         return menu;
     }
+
     int getId() const
     {
         return id;
@@ -77,22 +75,14 @@ public:
     {
         return name;
     }
-    QColor getColor() const
+    bool getShownInCounterArea() const
     {
-        return color;
-    }
-    int getRadius() const
-    {
-        return radius;
+        return shownInCounterArea;
     }
     int getValue() const
     {
         return value;
     }
-    bool getShownInCounterArea() const
-    {
-        return shownInCounterArea;
-    }
 };
 
 class AbstractCounterDialog : public QInputDialog
diff --git a/cockatrice/src/game/board/arrow_data.cpp b/cockatrice/src/game/board/arrow_data.cpp
deleted file mode 100644
index 9e89deed0..000000000
--- a/cockatrice/src/game/board/arrow_data.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "arrow_data.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
deleted file mode 100644
index 2752f97e3..000000000
--- a/cockatrice/src/game/board/arrow_data.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef COCKATRICE_ARROW_DATA_H
-#define COCKATRICE_ARROW_DATA_H
-
-#include <QColor>
-#include <QString>
-#include <libcockatrice/protocol/pb/serverinfo_arrow.pb.h>
-#include <libcockatrice/utility/color.h>
-
-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_graphics/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp
similarity index 57%
rename from cockatrice/src/game_graphics/board/arrow_item.cpp
rename to cockatrice/src/game/board/arrow_item.cpp
index af6a6bf36..60585a774 100644
--- a/cockatrice/src/game_graphics/board/arrow_item.cpp
+++ b/cockatrice/src/game/board/arrow_item.cpp
@@ -2,8 +2,8 @@
 #include "arrow_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
+#include "../player/player.h"
+#include "../player/player_actions.h"
 #include "../player/player_target.h"
 #include "../z_values.h"
 #include "../zones/card_zone.h"
@@ -21,49 +21,46 @@
 #include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/zone_names.h>
 
-ArrowItem::ArrowItem(QSharedPointer<const ArrowData> _data, ArrowTarget *_startItem, ArrowTarget *_targetItem)
-    : data(std::move(_data)), startItem(_startItem), targetItem(_targetItem)
+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(ZValues::ARROWS);
 
-    auto doUpdate = [this]() {
-        if (startItem && targetItem) {
-            updatePath();
-        }
-    };
+    if (startItem)
+        startItem->addArrowFrom(this);
+    if (targetItem)
+        targetItem->addArrowTo(this);
 
-    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) {
+    if (startItem && targetItem)
         updatePath();
-    }
 }
 
-void ArrowItem::onTargetDestroyed()
+ArrowItem::~ArrowItem()
 {
-    emit requestDeletion(data->creatorId, data->id);
 }
 
 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) {
+    if (!targetItem)
         return;
-    }
 
     QPointF endPoint = targetItem->mapToScene(
         QPointF(targetItem->boundingRect().width() / 2, targetItem->boundingRect().height() / 2));
@@ -78,9 +75,8 @@ void ArrowItem::updatePath(const QPointF &endPoint)
         headWidth / qPow(2, 0.5); // aka headWidth / sqrt (2) but this produces a compile error with MSVC++
     const double phi = 15;
 
-    if (!startItem) {
+    if (!startItem)
         return;
-    }
 
     QPointF startPoint =
         startItem->mapToScene(QPointF(startItem->boundingRect().width() / 2, startItem->boundingRect().height() / 2));
@@ -88,9 +84,9 @@ void ArrowItem::updatePath(const QPointF &endPoint)
     qreal lineLength = line.length();
 
     prepareGeometryChange();
-    if (lineLength < 30) {
+    if (lineLength < 30)
         path = QPainterPath();
-    } else {
+    else {
         QPointF c(lineLength / 2, qTan(phi * M_PI / 180) * lineLength);
 
         QPainterPath centerLine;
@@ -126,24 +122,24 @@ void ArrowItem::updatePath(const QPointF &endPoint)
 
 void ArrowItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
-    QColor paintColor(data->color);
-    if (fullColor) {
+    QColor paintColor(color);
+    if (fullColor)
         paintColor.setAlpha(200);
-    } else {
+    else
         paintColor.setAlpha(150);
-    }
     painter->setBrush(paintColor);
     painter->drawPath(path);
 }
 
 void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-    if (!data->isLocalCreator) {
+    if (!player->getPlayerInfo()->getLocal()) {
         event->ignore();
         return;
     }
 
-    for (auto *item : scene()->items(event->scenePos())) {
+    QList<QGraphicsItem *> colliding = scene()->items(event->scenePos());
+    for (QGraphicsItem *item : colliding) {
         if (qgraphicsitem_cast<CardItem *>(item)) {
             event->ignore();
             return;
@@ -152,109 +148,95 @@ void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 
     event->accept();
     if (event->button() == Qt::RightButton) {
-        emit requestDeletion(data->creatorId, data->id);
+        Command_DeleteArrow cmd;
+        cmd.set_arrow_id(id);
+        player->getPlayerActions()->sendGameCommand(cmd);
     }
 }
 
-// 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)
+ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase)
+    : ArrowItem(_owner, -1, _startItem, 0, _color), deleteInPhase(_deleteInPhase)
 {
 }
 
-void ArrowDragItem::addChildArrow(ArrowDragItem *child)
+void ArrowDragItem::addChildArrow(ArrowDragItem *childArrow)
 {
-    childArrows.append(child);
+    childArrows.append(childArrow);
 }
 
 void ArrowDragItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
-    if (targetLocked || !startItem) {
+    // 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;
-    }
 
-    const QPointF endPos = event->scenePos();
+    QPointF endPos = event->scenePos();
 
-    ArrowTarget *cursorItem = nullptr;
+    QList<QGraphicsItem *> colliding = scene()->items(endPos);
+    ArrowTarget *cursorItem = 0;
     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();
+    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) {
-        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(); });
-        }
+    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();
     }
-
-    targetItem ? updatePath() : updatePath(endPos);
     update();
 
-    for (auto *child : childArrows) {
+    for (ArrowDragItem *child : childArrows) {
         child->mouseMoveEvent(event);
     }
 }
 
 void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
-    if (!startItem) {
+    if (!startItem)
         return;
-    }
 
-    if (targetItem && targetItem != startItem) {
-        CardItem *startCard = qgraphicsitem_cast<CardItem *>(startItem);
+    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.
-        if (!startCard) {
-            delArrow();
-            return;
-        }
-
-        CardZoneLogic *startZone = startCard->getZone();
+        CardItem *startCard = qgraphicsitem_cast<CardItem *>(startItem);
+        CardItem *targetCard = qgraphicsitem_cast<CardItem *>(targetItem);
 
         Command_CreateArrow cmd;
-        cmd.mutable_arrow_color()->CopyFrom(convertQColorToColor(data->color));
+        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 (auto *targetCard = qgraphicsitem_cast<CardItem *>(targetItem)) {
+        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 if (auto *targetPlayer = qgraphicsitem_cast<PlayerTarget *>(targetItem)) {
+        } 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());
-        } 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
@@ -264,11 +246,10 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             bool playToStack = SettingsCache::instance().getPlayToStack();
             if (ci && ((!playToStack && ci->getUiAttributes().tableRow == 3) ||
                        (playToStack && ci->getUiAttributes().tableRow != 0 &&
-                        startCard->getZone()->getName() != ZoneNames::STACK))) {
+                        startCard->getZone()->getName() != ZoneNames::STACK)))
                 cmd.set_start_zone(ZoneNames::STACK);
-            } else {
+            else
                 cmd.set_start_zone(playToStack ? ZoneNames::STACK : ZoneNames::TABLE);
-            }
         }
 
         if (deleteInPhase != 0) {
@@ -277,116 +258,111 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 
         player->getPlayerActions()->sendGameCommand(cmd);
     }
-
     delArrow();
-    for (auto *child : childArrows) {
+
+    for (ArrowDragItem *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())
+    : ArrowItem(_startItem->getOwner(), -1, _startItem, 0, Qt::green)
 {
 }
 
-void ArrowAttachItem::addChildArrow(ArrowAttachItem *child)
+void ArrowAttachItem::addChildArrow(ArrowAttachItem *childArrow)
 {
-    childArrows.append(child);
+    childArrows.append(childArrow);
 }
 
 void ArrowAttachItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
-    if (targetLocked || !startItem) {
+    if (targetLocked || !startItem)
         return;
-    }
 
-    const QPointF endPos = event->scenePos();
+    QPointF endPos = event->scenePos();
 
-    ArrowTarget *cursorItem = nullptr;
+    QList<QGraphicsItem *> colliding = scene()->items(endPos);
+    ArrowTarget *cursorItem = 0;
     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();
+    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) {
-        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(); });
-        }
+    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();
     }
-
-    targetItem ? updatePath() : updatePath(endPos);
     update();
 
-    for (auto *child : childArrows) {
+    for (ArrowAttachItem *child : childArrows) {
         child->mouseMoveEvent(event);
     }
 }
 
-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 (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)
 {
+    // do nothing if target is already attached to another card or is not in play
     if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != ZoneNames::TABLE) {
         return;
     }
 
+    CardZoneLogic *startZone = startCard->getZone();
+    CardZoneLogic *targetZone = targetCard->getZone();
+
     // move card onto table first if attaching from some other zone
-    if (startCard->getZone()->getName() != ZoneNames::TABLE) {
+    if (startZone->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_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
+    cmd.set_target_zone(targetZone->getName().toStdString());
     cmd.set_target_card_id(targetCard->getId());
+
     player->getPlayerActions()->sendGameCommand(cmd);
-}
\ No newline at end of file
+}
+
+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_graphics/board/arrow_item.h b/cockatrice/src/game/board/arrow_item.h
similarity index 64%
rename from cockatrice/src/game_graphics/board/arrow_item.h
rename to cockatrice/src/game/board/arrow_item.h
index 1c306e065..cb78ee066 100644
--- a/cockatrice/src/game_graphics/board/arrow_item.h
+++ b/cockatrice/src/game/board/arrow_item.h
@@ -1,44 +1,40 @@
+/**
+ * @file arrow_item.h
+ * @ingroup GameGraphics
+ * @brief TODO: Document this.
+ */
+
 #ifndef ARROWITEM_H
 #define ARROWITEM_H
 
-#include "../../game/board/arrow_data.h"
-#include "arrow_target.h"
-
 #include <QGraphicsItem>
-#include <QPointer>
-#include <QSharedPointer>
 
 class CardItem;
 class QGraphicsSceneMouseEvent;
-class PlayerLogic;
+class QMenu;
+class Player;
+class ArrowTarget;
 
 class ArrowItem : public QObject, public QGraphicsItem
 {
     Q_OBJECT
     Q_INTERFACES(QGraphicsItem)
-signals:
-    void requestDeletion(int creatorId, int id);
-
 private:
     QPainterPath path;
+    QMenu *menu;
 
 protected:
-    QSharedPointer<const ArrowData> data;
-    QPointer<ArrowTarget> startItem;
-    QPointer<ArrowTarget> targetItem;
-    bool targetLocked = false;
-    bool fullColor = true;
-
+    Player *player;
+    int id;
+    ArrowTarget *startItem, *targetItem;
+    bool targetLocked;
+    QColor color;
+    bool fullColor;
     void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
 
 public:
-    ArrowItem(QSharedPointer<const ArrowData> _data, ArrowTarget *_startItem, ArrowTarget *_targetItem);
-
-    void onTargetDestroyed();
-    void delArrow();
-    void updatePath();
-    void updatePath(const QPointF &endPoint);
-
+    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
     {
@@ -48,13 +44,24 @@ public:
     {
         return path;
     }
+    void updatePath();
+    void updatePath(const QPointF &endPoint);
+
     [[nodiscard]] int getId() const
     {
-        return data->id;
+        return id;
     }
-    [[nodiscard]] int getCreatorId() const
+    [[nodiscard]] Player *getPlayer() const
     {
-        return data->creatorId;
+        return player;
+    }
+    void setStartItem(ArrowTarget *_item)
+    {
+        startItem = _item;
+    }
+    void setTargetItem(ArrowTarget *_item)
+    {
+        targetItem = _item;
     }
     [[nodiscard]] ArrowTarget *getStartItem() const
     {
@@ -68,20 +75,19 @@ public:
     {
         targetLocked = _targetLocked;
     }
+    void delArrow();
 };
 
 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);
+    ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase);
+    void addChildArrow(ArrowDragItem *childArrow);
 
 protected:
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
@@ -92,18 +98,17 @@ 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);
+    void addChildArrow(ArrowAttachItem *childArrow);
 
 protected:
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
 };
 
-#endif
\ No newline at end of file
+#endif // ARROWITEM_H
diff --git a/cockatrice/src/game/board/arrow_target.cpp b/cockatrice/src/game/board/arrow_target.cpp
new file mode 100644
index 000000000..2dbd913fa
--- /dev/null
+++ b/cockatrice/src/game/board/arrow_target.cpp
@@ -0,0 +1,41 @@
+#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
new file mode 100644
index 000000000..55f4ef678
--- /dev/null
+++ b/cockatrice/src/game/board/arrow_target.h
@@ -0,0 +1,70 @@
+/**
+ * @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_graphics/board/card_drag_item.cpp b/cockatrice/src/game/board/card_drag_item.cpp
similarity index 90%
rename from cockatrice/src/game_graphics/board/card_drag_item.cpp
rename to cockatrice/src/game/board/card_drag_item.cpp
index 49467c5c9..5ae56ccba 100644
--- a/cockatrice/src/game_graphics/board/card_drag_item.cpp
+++ b/cockatrice/src/game/board/card_drag_item.cpp
@@ -24,9 +24,8 @@ 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)
@@ -39,19 +38,16 @@ 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.
@@ -63,9 +59,8 @@ 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);
         }
 
@@ -83,27 +78,23 @@ 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_graphics/board/card_drag_item.h b/cockatrice/src/game/board/card_drag_item.h
similarity index 96%
rename from cockatrice/src/game_graphics/board/card_drag_item.h
rename to cockatrice/src/game/board/card_drag_item.h
index 74d25ad04..930c6be6f 100644
--- a/cockatrice/src/game_graphics/board/card_drag_item.h
+++ b/cockatrice/src/game/board/card_drag_item.h
@@ -1,8 +1,8 @@
 /**
  * @file card_drag_item.h
  * @ingroup GameGraphicsCards
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef CARDDRAGITEM_H
 #define CARDDRAGITEM_H
diff --git a/cockatrice/src/game_graphics/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp
similarity index 68%
rename from cockatrice/src/game_graphics/board/card_item.cpp
rename to cockatrice/src/game/board/card_item.cpp
index cabe988c2..62de4a02e 100644
--- a/cockatrice/src/game_graphics/board/card_item.cpp
+++ b/cockatrice/src/game/board/card_item.cpp
@@ -1,12 +1,12 @@
 #include "card_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/phase.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/view_zone_logic.h"
 #include "../../interface/widgets/tabs/tab_game.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"
@@ -20,19 +20,15 @@
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 
-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)
+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)
 {
     owner->addCard(this);
 
     connect(&SettingsCache::instance().cardCounters(), &CardCounterSettings::colorChanged, this, [this](int counterId) {
-        if (state->getCounters().contains(counterId)) {
+        if (counters.contains(counterId))
             update();
-        }
     });
 }
 
@@ -40,7 +36,7 @@ void CardItem::prepareDelete()
 {
     if (owner != nullptr) {
         if (owner->getGame()->getActiveCard() == this) {
-            emit owner->requestCardMenuUpdate(nullptr);
+            owner->getPlayerMenu()->updateCardMenu(nullptr);
             owner->getGame()->setActiveCard(nullptr);
         }
         owner = nullptr;
@@ -51,24 +47,23 @@ void CardItem::prepareDelete()
         attachedCards.first()->setAttachedTo(nullptr);
     }
 
-    if (state->getAttachedTo() != nullptr) {
-        state->getAttachedTo()->removeAttachedCard(this);
-        state->setAttachedTo(nullptr);
+    if (attachedTo != nullptr) {
+        attachedTo->removeAttachedCard(this);
+        attachedTo = nullptr;
     }
 }
 
 void CardItem::deleteLater()
 {
     prepareDelete();
-    if (scene()) {
+    if (scene())
         static_cast<GameScene *>(scene())->unregisterAnimationItem(this);
-    }
     AbstractCardItem::deleteLater();
 }
 
 void CardItem::setZone(CardZoneLogic *_zone)
 {
-    state->setZone(_zone);
+    zone = _zone;
 }
 
 void CardItem::retranslateUi()
@@ -83,23 +78,23 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     AbstractCardItem::paint(painter, option, widget);
 
     int i = 0;
-    QMapIterator<int, int> counterIterator(state->getCounters());
+    QMapIterator<int, int> counterIterator(counters);
     while (counterIterator.hasNext()) {
         counterIterator.next();
         QColor _color = cardCounterSettings.color(counterIterator.key());
 
-        paintNumberEllipse(counterIterator.value(), 14, _color, i, state->getCounters().size(), painter);
+        paintNumberEllipse(counterIterator.value(), 14, _color, i, counters.size(), painter);
         ++i;
     }
 
     QSizeF translatedSize = getTranslatedSize(painter);
     qreal scaleFactor = translatedSize.width() / boundingRect().width();
 
-    if (!state->getPT().isEmpty()) {
+    if (!pt.isEmpty()) {
         painter->save();
         transformPainter(painter, translatedSize, tapAngle);
 
-        if (!getFaceDown() && state->getPT() == exactCard.getInfo().getPowTough()) {
+        if (!getFaceDown() && pt == exactCard.getInfo().getPowTough()) {
             painter->setPen(Qt::white);
         } else {
             painter->setPen(QColor(255, 150, 0)); // dark orange
@@ -110,11 +105,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, state->getPT());
+                          Qt::AlignRight | Qt::AlignBottom, pt);
         painter->restore();
     }
 
-    if (!state->getAnnotation().isEmpty()) {
+    if (!annotation.isEmpty()) {
         painter->save();
 
         transformPainter(painter, translatedSize, tapAngle);
@@ -124,7 +119,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, state->getAnnotation());
+                          Qt::AlignCenter | Qt::TextWrapAnywhere, annotation);
         painter->restore();
     }
 
@@ -132,7 +127,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
         painter->fillPath(shape(), QBrush(QColor(255, 0, 0, 100)));
     }
 
-    if (state->getDoesntUntap()) {
+    if (doesntUntap) {
         painter->save();
 
         painter->setRenderHint(QPainter::Antialiasing, false);
@@ -151,66 +146,69 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 
 void CardItem::setAttacking(bool _attacking)
 {
-    state->setAttacking(_attacking);
+    attacking = _attacking;
     update();
 }
 
 void CardItem::setCounter(int _id, int _value)
 {
-    state->setCounter(_id, _value);
+    if (_value)
+        counters.insert(_id, _value);
+    else
+        counters.remove(_id);
     update();
 }
 
 void CardItem::setAnnotation(const QString &_annotation)
 {
-    state->setAnnotation(_annotation);
+    annotation = _annotation;
     update();
 }
 
 void CardItem::setDoesntUntap(bool _doesntUntap)
 {
-    state->setDoesntUntap(_doesntUntap);
+    doesntUntap = _doesntUntap;
     update();
 }
 
 void CardItem::setPT(const QString &_pt)
 {
-    state->setPT(_pt);
+    pt = _pt;
     update();
 }
 
 void CardItem::setAttachedTo(CardItem *_attachedTo)
 {
-    if (state->getAttachedTo() != nullptr) {
-        state->getAttachedTo()->removeAttachedCard(this);
+    if (attachedTo != nullptr) {
+        attachedTo->removeAttachedCard(this);
     }
 
     gridPoint.setX(-1);
-    state->setAttachedTo(_attachedTo);
-    if (state->getAttachedTo() != nullptr) {
+    attachedTo = _attachedTo;
+    if (attachedTo != 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 (state->getAttachedTo()->getZone() == nullptr) {
+        if (attachedTo->zone == nullptr) {
             deleteLater();
         } else {
-            emit state->getAttachedTo()->getZone()->cardAdded(this);
-            state->getAttachedTo()->addAttachedCard(this);
-            if (state->getZone() != state->getAttachedTo()->getZone()) {
-                state->getAttachedTo()->getZone()->reorganizeCards();
+            emit attachedTo->zone->cardAdded(this);
+            attachedTo->addAttachedCard(this);
+            if (zone != attachedTo->getZone()) {
+                attachedTo->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 (state->getZone() == nullptr) {
+        if (zone == nullptr) {
             deleteLater();
         } else {
-            emit state->getZone()->cardAdded(this);
+            emit zone->cardAdded(this);
         }
     }
 
-    if (state->getZone() != nullptr) {
-        state->getZone()->reorganizeCards();
+    if (zone != nullptr) {
+        zone->reorganizeCards();
     }
 }
 
@@ -219,23 +217,28 @@ void CardItem::setAttachedTo(CardItem *_attachedTo)
  */
 void CardItem::resetState(bool keepAnnotations)
 {
-    state->resetState(keepAnnotations);
+    attacking = false;
+    counters.clear();
+    pt.clear();
+    if (!keepAnnotations) {
+        annotation.clear();
+    }
+    attachedTo = 0;
     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)
 {
-    state->clearCounters();
+    counters.clear();
     const int counterListSize = _info.counter_list_size();
     for (int i = 0; i < counterListSize; ++i) {
         const ServerInfo_CardCounter &counterInfo = _info.counter_list(i);
-        state->insertCounter(counterInfo.id(), counterInfo.value());
+        counters.insert(counterInfo.id(), counterInfo.value());
     }
 
     setId(_info.id());
@@ -272,12 +275,11 @@ void CardItem::deleteDragItem()
 
 void CardItem::drawArrow(const QColor &arrowColor)
 {
-    if (owner->getGame()->getPlayerManager()->isSpectator()) {
+    if (owner->getGame()->getPlayerManager()->isSpectator())
         return;
-    }
 
     auto *game = owner->getGame();
-    PlayerLogic *arrowOwner = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
+    Player *arrowOwner = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
     int phase = 0; // 0 means to not set the phase
     if (SettingsCache::instance().getDoNotDeleteArrowsInSubPhases()) {
         int currentPhase = game->getGameState()->getCurrentPhase();
@@ -289,12 +291,10 @@ 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() != state->getZone()) {
+        if (card->getZone() != zone)
             continue;
-        }
 
         ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor, phase);
         scene()->addItem(childArrow);
@@ -304,9 +304,8 @@ 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);
@@ -314,12 +313,10 @@ void CardItem::drawAttachArrow()
 
     for (const auto &item : scene()->selectedItems()) {
         CardItem *card = qgraphicsitem_cast<CardItem *>(item);
-        if (card == nullptr) {
+        if (card == nullptr)
             continue;
-        }
-        if (card->getZone() != state->getZone()) {
+        if (card->getZone() != zone)
             continue;
-        }
 
         ArrowAttachItem *childArrow = new ArrowAttachItem(card);
         scene()->addItem(childArrow);
@@ -331,32 +328,27 @@ 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 *>(state->getZone())) {
-            if (view->getRevealZone() && !view->getWriteableRevealZone()) {
+        if (const ZoneViewZoneLogic *view = qobject_cast<const ZoneViewZoneLogic *>(zone)) {
+            if (view->getRevealZone() && !view->getWriteableRevealZone())
                 return;
-            }
-        } else if (!owner->getPlayerInfo()->getLocalOrJudge()) {
+        } else if (!owner->getPlayerInfo()->getLocalOrJudge())
             return;
-        }
 
         bool forceFaceDown = event->modifiers().testFlag(Qt::ShiftModifier);
 
@@ -368,16 +360,14 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
         int childIndex = 0;
         for (const auto &item : scene()->selectedItems()) {
             CardItem *card = static_cast<CardItem *>(item);
-            if ((card == this) || (card->getZone() != state->getZone())) {
+            if ((card == this) || (card->getZone() != zone))
                 continue;
-            }
             ++childIndex;
             QPointF childPos;
-            if (state->getZone()->getHasCardAttr()) {
+            if (zone->getHasCardAttr())
                 childPos = card->pos() - pos();
-            } else {
+            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);
@@ -390,57 +380,22 @@ 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 *>(state->getZone());
-    if (tz) {
+    TableZoneLogic *tz = qobject_cast<TableZoneLogic *>(zone);
+    if (tz)
         emit tz->toggleTapped();
-    } else {
+    else {
         if (SettingsCache::instance().getClickPlaysAllSelected()) {
-            if (faceDown) {
-                emit playSelectedFaceDown(this);
-            } else {
-                emit playSelected(this);
-            }
+            faceDown ? zone->getPlayer()->getPlayerActions()->actPlayFacedown()
+                     : zone->getPlayer()->getPlayerActions()->actPlay();
         } else {
-            state->getZone()->getPlayer()->getPlayerActions()->playCard(this, faceDown);
+            zone->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.
@@ -461,11 +416,11 @@ static bool isUnwritableRevealZone(CardZoneLogic *zone)
  */
 void CardItem::handleClickedToPlay(bool shiftHeld)
 {
-    if (isUnwritableRevealZone(state->getZone())) {
+    if (isUnwritableRevealZone(zone)) {
         if (SettingsCache::instance().getClickPlaysAllSelected()) {
-            emit hideSelected(this);
+            zone->getPlayer()->getPlayerActions()->actHide();
         } else {
-            state->getZone()->removeCard(this);
+            zone->removeCard(this);
         }
     } else {
         playCard(shiftHeld);
@@ -474,15 +429,21 @@ void CardItem::handleClickedToPlay(bool shiftHeld)
 
 void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
-    if (event->button() == Qt::RightButton && owner != nullptr) {
-        emit rightClicked(this, event->screenPos());
-        return;
-    }
-    if ((event->modifiers() != Qt::AltModifier) && (event->button() == Qt::LeftButton) &&
-        (!SettingsCache::instance().getDoubleClickToPlay())) {
+    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())) {
         handleClickedToPlay(event->modifiers().testFlag(Qt::ShiftModifier));
     }
-    if (owner != nullptr) {
+
+    if (owner != nullptr) { // cards without owner will be deleted
         setCursor(Qt::OpenHandCursor);
     }
     AbstractCardItem::mouseReleaseEvent(event);
@@ -501,9 +462,8 @@ bool CardItem::animationEvent()
 {
     int rotation = ROTATION_DEGREES_PER_FRAME;
     bool animationIncomplete = true;
-    if (!tapped) {
+    if (!tapped)
         rotation *= -1;
-    }
 
     tapAngle += rotation;
     if (tapped && (tapAngle > 90)) {
@@ -528,14 +488,14 @@ bool CardItem::animationEvent()
 QVariant CardItem::itemChange(GraphicsItemChange change, const QVariant &value)
 {
     if ((change == ItemSelectedHasChanged) && owner != nullptr) {
-        bool selected = value.toBool();
-
-        if (selected) {
+        if (value == true) {
             owner->getGame()->setActiveCard(this);
+            owner->getPlayerMenu()->updateCardMenu(this);
+        } else if (owner->getGameScene()->selectedItems().isEmpty()) {
+
+            owner->getGame()->setActiveCard(nullptr);
+            owner->getPlayerMenu()->updateCardMenu(nullptr);
         }
-
-        emit selectionChanged(this, selected);
     }
-
     return AbstractCardItem::itemChange(change, value);
-}
\ No newline at end of file
+}
diff --git a/cockatrice/src/game_graphics/board/card_item.h b/cockatrice/src/game/board/card_item.h
similarity index 64%
rename from cockatrice/src/game_graphics/board/card_item.h
rename to cockatrice/src/game/board/card_item.h
index 8efcd085d..da2097a2c 100644
--- a/cockatrice/src/game_graphics/board/card_item.h
+++ b/cockatrice/src/game/board/card_item.h
@@ -1,37 +1,42 @@
 /**
  * @file card_item.h
  * @ingroup GameGraphicsCards
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef CARDITEM_H
 #define CARDITEM_H
 
-#include "../../game/board/card_state.h"
-#include "../../game/zones/card_zone_logic.h"
+#include "../zones/logic/card_zone_logic.h"
 #include "abstract_card_item.h"
 
 #include <libcockatrice/network/server/remote/game/server_card.h>
-#include <libcockatrice/utility/trice_limits.h>
 
 class CardDatabase;
 class CardDragItem;
 class CardZone;
 class ServerInfo_Card;
-class PlayerLogic;
+class Player;
 class QAction;
 class QColor;
 
+const int MAX_COUNTERS_ON_CARD = 999;
 const int ROTATION_DEGREES_PER_FRAME = 10;
 
 class CardItem : public AbstractCardItem
 {
     Q_OBJECT
 private:
-    CardState *state;
-
+    CardZoneLogic *zone;
+    bool attacking;
+    QMap<int, int> counters;
+    QString annotation;
+    QString pt;
+    bool destroyOnZoneChange;
+    bool doesntUntap;
     QPoint gridPoint;
     CardDragItem *dragItem;
+    CardItem *attachedTo;
     QList<CardItem *> attachedCards;
 
     void prepareDelete();
@@ -48,20 +53,16 @@ public:
     {
         return Type;
     }
-    explicit CardItem(PlayerLogic *_owner,
+    explicit CardItem(Player *_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 state->getZone();
+        return zone;
     }
     void setZone(CardZoneLogic *_zone);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
@@ -77,50 +78,50 @@ public:
     {
         return gridPoint;
     }
-    [[nodiscard]] PlayerLogic *getOwner() const
+    [[nodiscard]] Player *getOwner() const
     {
         return owner;
     }
-    void setOwner(PlayerLogic *_owner)
+    void setOwner(Player *_owner)
     {
         owner = _owner;
     }
     [[nodiscard]] bool getAttacking() const
     {
-        return state->getAttacking();
+        return attacking;
     }
     void setAttacking(bool _attacking);
     [[nodiscard]] const QMap<int, int> &getCounters() const
     {
-        return state->getCounters();
+        return counters;
     }
     void setCounter(int _id, int _value);
     [[nodiscard]] QString getAnnotation() const
     {
-        return state->getAnnotation();
+        return annotation;
     }
     void setAnnotation(const QString &_annotation);
     [[nodiscard]] bool getDoesntUntap() const
     {
-        return state->getDoesntUntap();
+        return doesntUntap;
     }
     void setDoesntUntap(bool _doesntUntap);
     [[nodiscard]] QString getPT() const
     {
-        return state->getPT();
+        return pt;
     }
     void setPT(const QString &_pt);
     [[nodiscard]] bool getDestroyOnZoneChange() const
     {
-        return state->getDestroyOnZoneChange();
+        return destroyOnZoneChange;
     }
     void setDestroyOnZoneChange(bool _destroy)
     {
-        state->setDestroyOnZoneChange(_destroy);
+        destroyOnZoneChange = _destroy;
     }
     [[nodiscard]] CardItem *getAttachedTo() const
     {
-        return state->getAttachedTo();
+        return attachedTo;
     }
     void setAttachedTo(CardItem *_attachedTo);
     void addAttachedCard(CardItem *card)
@@ -145,26 +146,6 @@ public:
     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/card_list.cpp b/cockatrice/src/game/board/card_list.cpp
index 0080b5ae6..c324ca10a 100644
--- a/cockatrice/src/game/board/card_list.cpp
+++ b/cockatrice/src/game/board/card_list.cpp
@@ -1,6 +1,6 @@
 #include "card_list.h"
 
-#include "../../game_graphics/board/card_item.h"
+#include "card_item.h"
 
 #include <QDebug>
 #include <algorithm>
diff --git a/cockatrice/src/game/board/card_list.h b/cockatrice/src/game/board/card_list.h
index 85a6848b7..07be33b32 100644
--- a/cockatrice/src/game/board/card_list.h
+++ b/cockatrice/src/game/board/card_list.h
@@ -1,8 +1,8 @@
 /**
  * @file card_list.h
  * @ingroup GameLogicCards
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef CARDLIST_H
 #define CARDLIST_H
diff --git a/cockatrice/src/game/board/card_state.cpp b/cockatrice/src/game/board/card_state.cpp
deleted file mode 100644
index 4319400d7..000000000
--- a/cockatrice/src/game/board/card_state.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#include "card_state.h"
-
-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
deleted file mode 100644
index 0498b1aa2..000000000
--- a/cockatrice/src/game/board/card_state.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef COCKATRICE_CARD_STATE_H
-#define COCKATRICE_CARD_STATE_H
-
-#include <QMap>
-#include <QObject>
-
-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_graphics/board/counter_general.cpp b/cockatrice/src/game/board/counter_general.cpp
similarity index 65%
rename from cockatrice/src/game_graphics/board/counter_general.cpp
rename to cockatrice/src/game/board/counter_general.cpp
index 379c6f837..d68486a1b 100644
--- a/cockatrice/src/game_graphics/board/counter_general.cpp
+++ b/cockatrice/src/game/board/counter_general.cpp
@@ -1,12 +1,19 @@
 #include "counter_general.h"
 
+#include "../../game_graphics/board/abstract_graphics_item.h"
 #include "../../interface/pixel_map_generator.h"
-#include "abstract_graphics_item.h"
 
 #include <QPainter>
 
-GeneralCounter::GeneralCounter(CounterState *state, PlayerLogic *player, bool useNameForShortcut, QGraphicsItem *parent)
-    : AbstractCounter(state, player, true, useNameForShortcut, parent)
+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)
 {
     setCacheMode(DeviceCoordinateCache);
 }
diff --git a/cockatrice/src/game_graphics/board/counter_general.h b/cockatrice/src/game/board/counter_general.h
similarity index 62%
rename from cockatrice/src/game_graphics/board/counter_general.h
rename to cockatrice/src/game/board/counter_general.h
index 0a2e882ce..3db1d7bb4 100644
--- a/cockatrice/src/game_graphics/board/counter_general.h
+++ b/cockatrice/src/game/board/counter_general.h
@@ -1,8 +1,8 @@
 /**
  * @file counter_general.h
  * @ingroup GameGraphicsPlayers
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COUNTER_GENERAL_H
 #define COUNTER_GENERAL_H
@@ -12,10 +12,17 @@
 class GeneralCounter : public AbstractCounter
 {
     Q_OBJECT
+private:
+    QColor color;
+    int radius;
 
 public:
-    GeneralCounter(CounterState *state,
-                   PlayerLogic *player,
+    GeneralCounter(Player *_player,
+                   int _id,
+                   const QString &_name,
+                   const QColor &_color,
+                   int _radius,
+                   int _value,
                    bool useNameForShortcut = false,
                    QGraphicsItem *parent = nullptr);
     QRectF boundingRect() const override;
diff --git a/cockatrice/src/game/board/counter_state.cpp b/cockatrice/src/game/board/counter_state.cpp
deleted file mode 100644
index 6da18b662..000000000
--- a/cockatrice/src/game/board/counter_state.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "counter_state.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)
-{
-    if (newValue == value) {
-        return;
-    }
-    int old = value;
-    value = newValue;
-    emit valueChanged(old, newValue);
-}
\ No newline at end of file
diff --git a/cockatrice/src/game/board/counter_state.h b/cockatrice/src/game/board/counter_state.h
deleted file mode 100644
index 0f2f16b55..000000000
--- a/cockatrice/src/game/board/counter_state.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef COCKATRICE_COUNTER_STATE_H
-#define COCKATRICE_COUNTER_STATE_H
-
-#include <QColor>
-#include <QObject>
-#include <QString>
-#include <libcockatrice/protocol/pb/serverinfo_counter.pb.h>
-
-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;
-    }
-
-    void setValue(int newValue);
-
-signals:
-    void valueChanged(int oldValue, int newValue);
-
-private:
-    int id;
-    QString name;
-    QColor color;
-    int radius;
-    int value;
-};
-
-#endif // COCKATRICE_COUNTER_STATE_H
diff --git a/cockatrice/src/game_graphics/board/translate_counter_name.cpp b/cockatrice/src/game/board/translate_counter_name.cpp
similarity index 100%
rename from cockatrice/src/game_graphics/board/translate_counter_name.cpp
rename to cockatrice/src/game/board/translate_counter_name.cpp
diff --git a/cockatrice/src/game_graphics/board/translate_counter_name.h b/cockatrice/src/game/board/translate_counter_name.h
similarity index 94%
rename from cockatrice/src/game_graphics/board/translate_counter_name.h
rename to cockatrice/src/game/board/translate_counter_name.h
index ba3a94fa5..fdb277c11 100644
--- a/cockatrice/src/game_graphics/board/translate_counter_name.h
+++ b/cockatrice/src/game/board/translate_counter_name.h
@@ -1,8 +1,8 @@
 /**
  * @file translate_counter_name.h
  * @ingroup GameGraphicsPlayers
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TRANSLATECOUNTERNAME_H
 #define TRANSLATECOUNTERNAME_H
diff --git a/cockatrice/src/game_graphics/card_dimensions.h b/cockatrice/src/game/card_dimensions.h
similarity index 76%
rename from cockatrice/src/game_graphics/card_dimensions.h
rename to cockatrice/src/game/card_dimensions.h
index c59a01b48..255d0bc04 100644
--- a/cockatrice/src/game_graphics/card_dimensions.h
+++ b/cockatrice/src/game/card_dimensions.h
@@ -12,16 +12,16 @@
  */
 namespace CardDimensions
 {
-/** @brief Card width in pixels. */
+/// Card width in pixels
 constexpr int WIDTH = 72;
-/** @brief Card height in pixels. */
+/// Card height in pixels
 constexpr int HEIGHT = 102;
 
-/** @brief Pre-converted for floating-point contexts (Z-value calculations). */
+/// 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. */
+/// 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
diff --git a/cockatrice/src/game_graphics/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp
similarity index 92%
rename from cockatrice/src/game_graphics/deckview/deck_view.cpp
rename to cockatrice/src/game/deckview/deck_view.cpp
index ced02c8db..620dfaa5f 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view.cpp
+++ b/cockatrice/src/game/deckview/deck_view.cpp
@@ -24,21 +24,17 @@ 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);
     }
 }
@@ -108,13 +104,11 @@ void DeckViewCard::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
 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());
@@ -126,9 +120,8 @@ 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 * CardDimensions::WIDTH_HALF_F, 0);
         auto *drag = new DeckViewCardDragItem(c, childPos, dragItem);
@@ -140,9 +133,8 @@ 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;
@@ -155,13 +147,12 @@ 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);
         }
@@ -241,9 +232,8 @@ 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;
 }
 
@@ -272,9 +262,8 @@ QSizeF DeckViewCardContainer::calculateBoundingRect(const QList<QPair<int, int>>
     // Calculate space needed for cards
     for (int i = 0; i < rowsAndCols.size(); ++i) {
         totalHeight += CardDimensions::HEIGHT_F * rowsAndCols[i].first + paddingY;
-        if (CardDimensions::WIDTH_F * rowsAndCols[i].second > totalWidth) {
+        if (CardDimensions::WIDTH_F * rowsAndCols[i].second > totalWidth)
             totalWidth = CardDimensions::WIDTH_F * rowsAndCols[i].second;
-        }
     }
 
     return QSizeF(getCardTypeTextWidth() + totalWidth, totalHeight + separatorY + paddingY);
@@ -282,9 +271,8 @@ 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;
 }
 
@@ -334,17 +322,15 @@ 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();
@@ -356,9 +342,8 @@ void DeckViewScene::rebuildTree()
 {
     clearContents();
 
-    if (!deck) {
+    if (!deck)
         return;
-    }
 
     for (auto *currentZone : deck->getZoneNodes()) {
         DeckViewCardContainer *container = cardContainers.value(currentZone->getName(), 0);
@@ -370,9 +355,8 @@ void DeckViewScene::rebuildTree()
 
         for (int j = 0; j < currentZone->size(); j++) {
             auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-            if (!currentCard) {
+            if (!currentCard)
                 continue;
-            }
 
             for (int k = 0; k < currentCard->getNumber(); ++k) {
                 auto *newCard = new DeckViewCard(container, currentCard->toCardRef(), currentZone->getName());
@@ -389,21 +373,18 @@ 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);
@@ -424,9 +405,8 @@ 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;
@@ -437,27 +417,23 @@ 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;
@@ -475,9 +451,8 @@ 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));
 }
@@ -495,7 +470,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());
@@ -503,7 +478,6 @@ QList<MoveCard_ToZone> DeckViewScene::getSideboardPlan() const
                 m.set_target_zone(cont->getName().toStdString());
                 result.append(m);
             }
-        }
     }
     return result;
 }
diff --git a/cockatrice/src/game_graphics/deckview/deck_view.h b/cockatrice/src/game/deckview/deck_view.h
similarity index 99%
rename from cockatrice/src/game_graphics/deckview/deck_view.h
rename to cockatrice/src/game/deckview/deck_view.h
index f996fd4da..5abc558bd 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view.h
+++ b/cockatrice/src/game/deckview/deck_view.h
@@ -1,8 +1,8 @@
 /**
  * @file deck_view.h
  * @ingroup Lobby
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DECKVIEW_H
 #define DECKVIEW_H
diff --git a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp
similarity index 99%
rename from cockatrice/src/game_graphics/deckview/deck_view_container.cpp
rename to cockatrice/src/game/deckview/deck_view_container.cpp
index cbd6c2bad..44b2be6d1 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
+++ b/cockatrice/src/game/deckview/deck_view_container.cpp
@@ -251,9 +251,8 @@ void DeckViewContainer::unloadDeck()
 void DeckViewContainer::loadLocalDeck()
 {
     DlgLoadDeck dialog(this);
-    if (!dialog.exec()) {
+    if (!dialog.exec())
         return;
-    }
 
     loadDeckFromFile(dialog.selectedFiles().at(0));
 }
@@ -365,9 +364,8 @@ 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);
 }
 
@@ -406,9 +404,8 @@ void DeckViewContainer::setSideboardLocked(bool locked)
 {
     sideboardLockButton->setState(!locked);
     deckView->setLocked(readyStartButton->getState() || !sideboardLockButton->getState());
-    if (locked) {
+    if (locked)
         deckView->resetSideboardPlan();
-    }
 }
 
 void DeckViewContainer::setDeck(const DeckList &deck)
diff --git a/cockatrice/src/game_graphics/deckview/deck_view_container.h b/cockatrice/src/game/deckview/deck_view_container.h
similarity index 98%
rename from cockatrice/src/game_graphics/deckview/deck_view_container.h
rename to cockatrice/src/game/deckview/deck_view_container.h
index ec024bace..6d685cd79 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view_container.h
+++ b/cockatrice/src/game/deckview/deck_view_container.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
similarity index 100%
rename from cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
rename to cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
diff --git a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h b/cockatrice/src/game/deckview/tabbed_deck_view_container.h
similarity index 95%
rename from cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
rename to cockatrice/src/game/deckview/tabbed_deck_view_container.h
index 7cfa8c9aa..c34eef1ef 100644
--- a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
+++ b/cockatrice/src/game/deckview/tabbed_deck_view_container.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp
similarity index 98%
rename from cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
rename to cockatrice/src/game/dialogs/dlg_create_token.cpp
index 11c24b72e..df264f065 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp
@@ -101,9 +101,8 @@ 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
@@ -186,9 +185,8 @@ 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().getAnnotateTokens())
             annotationEdit->setText(cardInfo->getText());
-        }
     } else {
         nameEdit->setText("");
         colorEdit->setCurrentIndex(colorEdit->findData(QString(), Qt::UserRole, Qt::MatchFixedString));
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h b/cockatrice/src/game/dialogs/dlg_create_token.h
similarity index 98%
rename from cockatrice/src/game_graphics/dialogs/dlg_create_token.h
rename to cockatrice/src/game/dialogs/dlg_create_token.h
index 281e161fc..9a18f1a57 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
+++ b/cockatrice/src/game/dialogs/dlg_create_token.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_create_token.h
  * @ingroup GameDialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_CREATETOKEN_H
 #define DLG_CREATETOKEN_H
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
similarity index 88%
rename from cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
rename to cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
index 2b54452ac..a9db4cef6 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
+++ b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
@@ -12,7 +12,8 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
 
-DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, const MoveTopCardsUntilOptions &options) : QDialog(parent)
+DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, uint _numberOfHits, bool autoPlay)
+    : QDialog(parent)
 {
     exprLabel = new QLabel(tr("Card name (or search expressions):"));
 
@@ -20,13 +21,13 @@ DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, const MoveTopCardsUn
     exprComboBox->setFocus();
     exprComboBox->setEditable(true);
     exprComboBox->setInsertPolicy(QComboBox::InsertAtTop);
-    exprComboBox->insertItems(0, options.exprs);
+    exprComboBox->insertItems(0, exprs);
     exprLabel->setBuddy(exprComboBox);
 
     numberOfHitsLabel = new QLabel(tr("Number of hits:"));
     numberOfHitsEdit = new QSpinBox(this);
     numberOfHitsEdit->setRange(1, 99);
-    numberOfHitsEdit->setValue(options.numberOfHits);
+    numberOfHitsEdit->setValue(_numberOfHits);
     numberOfHitsLabel->setBuddy(numberOfHitsEdit);
 
     auto *grid = new QGridLayout;
@@ -34,7 +35,7 @@ DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, const MoveTopCardsUn
     grid->addWidget(numberOfHitsEdit, 0, 1);
 
     autoPlayCheckBox = new QCheckBox(tr("Auto play hits"));
-    autoPlayCheckBox->setChecked(options.autoPlay);
+    autoPlayCheckBox->setChecked(autoPlay);
 
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgMoveTopCardsUntil::validateAndAccept);
@@ -117,13 +118,6 @@ 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;
@@ -131,4 +125,14 @@ QStringList DlgMoveTopCardsUntil::getExprs() const
         exprs.append(exprComboBox->itemText(i));
     }
     return exprs;
-}
\ No newline at end of file
+}
+
+uint DlgMoveTopCardsUntil::getNumberOfHits() const
+{
+    return numberOfHitsEdit->text().toUInt();
+}
+
+bool DlgMoveTopCardsUntil::isAutoPlay() const
+{
+    return autoPlayCheckBox->isChecked();
+}
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.h
similarity index 67%
rename from cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
rename to cockatrice/src/game/dialogs/dlg_move_top_cards_until.h
index ac9d41a94..9a9dc91e7 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
+++ b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.h
@@ -1,8 +1,8 @@
 /**
  * @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
@@ -16,13 +16,6 @@
 
 class FilterString;
 
-struct MoveTopCardsUntilOptions
-{
-    QStringList exprs = {};
-    int numberOfHits = 1;
-    bool autoPlay = false;
-};
-
 class DlgMoveTopCardsUntil : public QDialog
 {
     Q_OBJECT
@@ -36,12 +29,15 @@ class DlgMoveTopCardsUntil : public QDialog
     void validateAndAccept();
     bool validateMatchExists(const FilterString &filterString);
 
-    [[nodiscard]] QStringList getExprs() const;
-
 public:
-    explicit DlgMoveTopCardsUntil(QWidget *parent = nullptr, const MoveTopCardsUntilOptions &options = {});
+    explicit DlgMoveTopCardsUntil(QWidget *parent = nullptr,
+                                  QStringList exprs = QStringList(),
+                                  uint numberOfHits = 1,
+                                  bool autoPlay = false);
     [[nodiscard]] QString getExpr() const;
-    [[nodiscard]] MoveTopCardsUntilOptions getOptions() const;
+    [[nodiscard]] QStringList getExprs() const;
+    [[nodiscard]] uint getNumberOfHits() const;
+    [[nodiscard]] bool isAutoPlay() const;
 };
 
 #endif // DLG_MOVE_TOP_CARDS_UNTIL_H
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp
similarity index 100%
rename from cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
rename to cockatrice/src/game/dialogs/dlg_roll_dice.cpp
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h b/cockatrice/src/game/dialogs/dlg_roll_dice.h
similarity index 95%
rename from cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
rename to cockatrice/src/game/dialogs/dlg_roll_dice.h
index 15f7dc1ba..69edd0757 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
+++ b/cockatrice/src/game/dialogs/dlg_roll_dice.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/game/game.cpp b/cockatrice/src/game/game.cpp
index 4c8b109c2..38477f7f7 100644
--- a/cockatrice/src/game/game.cpp
+++ b/cockatrice/src/game/game.cpp
@@ -4,16 +4,16 @@
 
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 
-Game::Game(QObject *_parent,
-           bool isLocalGame,
+Game::Game(TabGame *_tab,
            QList<AbstractClient *> &_clients,
            const Event_GameJoined &event,
            const QMap<int, QString> &_roomGameTypes)
-    : AbstractGame(_parent)
+    : AbstractGame(_tab)
 {
     gameMetaInfo->setFromProto(event.game_info());
     gameMetaInfo->setRoomGameTypes(_roomGameTypes);
-    gameState = new GameState(this, 0, event.host_id(), isLocalGame, _clients, false, event.resuming(), -1, false);
+    gameState = new GameState(this, 0, event.host_id(), tab->getTabSupervisor()->getIsLocalGame(), _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 4f912664c..96ebbae4d 100644
--- a/cockatrice/src/game/game.h
+++ b/cockatrice/src/game/game.h
@@ -1,8 +1,8 @@
 /**
  * @file game.h
  * @ingroup GameLogic
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COCKATRICE_GAME_H
 #define COCKATRICE_GAME_H
@@ -16,8 +16,7 @@ class Game : public AbstractGame
     Q_OBJECT
 
 public:
-    Game(QObject *parent,
-         bool isLocalGame,
+    Game(TabGame *tab,
          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 4a96eebdb..7bfc4da75 100644
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/cockatrice/src/game/game_event_handler.cpp
@@ -1,8 +1,8 @@
 #include "game_event_handler.h"
 
-#include "../game_graphics/log/message_log_widget.h"
 #include "../interface/widgets/tabs/tab_game.h"
 #include "abstract_game.h"
+#include "log/message_log_widget.h"
 
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
@@ -36,9 +36,8 @@ 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);
@@ -47,9 +46,8 @@ 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);
@@ -58,9 +56,8 @@ 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)
@@ -99,7 +96,7 @@ void GameEventHandler::processGameEventContainer(const GameEventContainer &cont,
 
         if (cont.has_forced_by_judge()) {
             auto id = cont.forced_by_judge();
-            PlayerLogic *judgep = game->getPlayerManager()->getPlayers().value(id, nullptr);
+            Player *judgep = game->getPlayerManager()->getPlayers().value(id, nullptr);
             if (judgep) {
                 emit setContextJudgeName(judgep->getPlayerInfo()->getName());
             } else if (game->getPlayerManager()->getSpectators().contains(id)) {
@@ -120,11 +117,9 @@ 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:
@@ -160,7 +155,7 @@ void GameEventHandler::processGameEventContainer(const GameEventContainer &cont,
                     break;
 
                 default: {
-                    PlayerLogic *player = game->getPlayerManager()->getPlayers().value(playerId, 0);
+                    Player *player = game->getPlayerManager()->getPlayers().value(playerId, 0);
                     if (!player) {
                         qCWarning(GameEventHandlerLog) << "unhandled game event: invalid player id";
                         break;
@@ -213,25 +208,11 @@ void GameEventHandler::handleChatMessageSent(const QString &chatMessage)
     sendGameCommand(cmd);
 }
 
-void GameEventHandler::handleArrowDeletion(int creatorId, int arrowId)
+void GameEventHandler::handleArrowDeletion(int arrowId)
 {
     Command_DeleteArrow cmd;
     cmd.set_arrow_id(arrowId);
-
-    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)
-{
-    if (response.response_code() == Response::RespNameNotFound) {
-        emit arrowDeleted(creatorId, arrowId);
-    }
+    sendGameCommand(cmd);
 }
 
 void GameEventHandler::eventSpectatorSay(const Event_GameSay &event,
@@ -275,7 +256,7 @@ void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event
                 emit spectatorJoined(prop);
             }
         } else {
-            PlayerLogic *player = game->getPlayerManager()->getPlayers().value(playerId, 0);
+            Player *player = game->getPlayerManager()->getPlayers().value(playerId, 0);
             if (!player) {
                 player = game->getPlayerManager()->addPlayer(playerId, prop.user_info());
                 emit playerJoined(prop);
@@ -303,9 +284,8 @@ 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()) {
@@ -324,10 +304,9 @@ void GameEventHandler::processCardAttachmentsForPlayers(const Event_GameStateCha
         const ServerInfo_Player &playerInfo = event.player_list(i);
         const ServerInfo_PlayerProperties &prop = playerInfo.properties();
         if (!prop.spectator()) {
-            PlayerLogic *player = game->getPlayerManager()->getPlayers().value(prop.player_id(), 0);
-            if (!player) {
+            Player *player = game->getPlayerManager()->getPlayers().value(prop.player_id(), 0);
+            if (!player)
                 continue;
-            }
             player->processCardAttachment(playerInfo);
         }
     }
@@ -337,10 +316,9 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties
                                                     int eventPlayerId,
                                                     const GameEventContext &context)
 {
-    PlayerLogic *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0);
-    if (!player) {
+    Player *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0);
+    if (!player)
         return;
-    }
     const ServerInfo_PlayerProperties &prop = event.player_properties();
     emit playerPropertiesChanged(prop, eventPlayerId);
 
@@ -348,9 +326,8 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties
     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 {
@@ -361,10 +338,9 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties
         case GameEventContext::CONCEDE: {
             player->setConceded(true);
 
-            QMapIterator<int, PlayerLogic *> playerIterator(game->getPlayerManager()->getPlayers());
-            while (playerIterator.hasNext()) {
+            QMapIterator<int, Player *> playerIterator(game->getPlayerManager()->getPlayers());
+            while (playerIterator.hasNext())
                 playerIterator.next().value()->updateZones();
-            }
 
             emit logConcede(eventPlayerId);
 
@@ -373,10 +349,9 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties
         case GameEventContext::UNCONCEDE: {
             player->setConceded(false);
 
-            QMapIterator<int, PlayerLogic *> playerIterator(game->getPlayerManager()->getPlayers());
-            while (playerIterator.hasNext()) {
+            QMapIterator<int, Player *> playerIterator(game->getPlayerManager()->getPlayers());
+            while (playerIterator.hasNext())
                 playerIterator.next().value()->updateZones();
-            }
 
             emit logUnconcede(eventPlayerId);
 
@@ -414,16 +389,15 @@ 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)) {
+    if (game->getPlayerManager()->getPlayers().contains(playerId))
         return;
-    }
 
     if (playerInfo.spectator()) {
         game->getPlayerManager()->addSpectator(playerId, playerInfo);
         emit logJoinSpectator(playerName);
         emit spectatorJoined(playerInfo);
     } else {
-        PlayerLogic *newPlayer = game->getPlayerManager()->addPlayer(playerId, playerInfo.user_info());
+        Player *newPlayer = game->getPlayerManager()->addPlayer(playerId, playerInfo.user_info());
         emit logJoinPlayer(newPlayer);
         emit playerJoined(playerInfo);
     }
@@ -451,25 +425,23 @@ QString GameEventHandler::getLeaveReason(Event_Leave::LeaveReason reason)
 }
 void GameEventHandler::eventLeave(const Event_Leave &event, int eventPlayerId, const GameEventContext & /*context*/)
 {
-    PlayerLogic *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0);
-    if (!player) {
+    Player *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, PlayerLogic *> playerIterator(game->getPlayerManager()->getPlayers());
-    while (playerIterator.hasNext()) {
+    QMapIterator<int, Player *> playerIterator(game->getPlayerManager()->getPlayers());
+    while (playerIterator.hasNext())
         playerIterator.next().value()->updateZones();
-    }
 
     emitUserEvent();
 }
@@ -488,10 +460,9 @@ void GameEventHandler::eventReverseTurn(const Event_ReverseTurn &event,
                                         int eventPlayerId,
                                         const GameEventContext & /*context*/)
 {
-    PlayerLogic *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0);
-    if (!player) {
+    Player *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0);
+    if (!player)
         return;
-    }
 
     emit logTurnReversed(player, event.reversed());
 }
@@ -519,10 +490,9 @@ void GameEventHandler::eventSetActivePlayer(const Event_SetActivePlayer &event,
                                             const GameEventContext & /*context*/)
 {
     game->getGameState()->setActivePlayer(event.active_player_id());
-    PlayerLogic *player = game->getPlayerManager()->getPlayer(event.active_player_id());
-    if (!player) {
+    Player *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 f47116949..302e7a6ff 100644
--- a/cockatrice/src/game/game_event_handler.h
+++ b/cockatrice/src/game/game_event_handler.h
@@ -1,8 +1,8 @@
 /**
  * @file game_event_handler.h
  * @ingroup GameLogic
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COCKATRICE_GAME_EVENT_HANDLER_H
 #define COCKATRICE_GAME_EVENT_HANDLER_H
@@ -38,7 +38,7 @@ class Event_Kicked;
 class Event_ReverseTurn;
 class AbstractGame;
 class PendingCommand;
-class PlayerLogic;
+class Player;
 
 inline Q_LOGGING_CATEGORY(GameEventHandlerLog, "game_event_handler");
 
@@ -60,8 +60,7 @@ public:
     void handleActivePhaseChanged(int phase);
     void handleGameLeft();
     void handleChatMessageSent(const QString &chatMessage);
-    void handleArrowDeletion(int creatorId, int arrowId);
-    void handleArrowDeletionFinished(const Response &response, int creatorId, int arrowId);
+    void handleArrowDeletion(int arrowId);
 
     void eventSpectatorSay(const Event_GameSay &event, int eventPlayerId, const GameEventContext &context);
     void eventSpectatorLeave(const Event_Leave &event, int eventPlayerId, const GameEventContext &context);
@@ -96,7 +95,7 @@ public slots:
 signals:
     void emitUserEvent();
     void addPlayerToAutoCompleteList(QString playerName);
-    void localPlayerDeckSelected(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo);
+    void localPlayerDeckSelected(Player *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);
@@ -113,22 +112,21 @@ signals:
     void containerProcessingStarted(GameEventContext context);
     void setContextJudgeName(QString judgeName);
     void containerProcessingDone();
-    void arrowDeleted(int creatorId, int arrowId);
     void logSpectatorSay(ServerInfo_User userInfo, QString message);
     void logSpectatorLeave(QString name, QString reason);
     void logGameStart();
-    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 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 logJoinSpectator(QString spectatorName);
-    void logJoinPlayer(PlayerLogic *player);
-    void logLeave(PlayerLogic *player, QString reason);
+    void logJoinPlayer(Player *player);
+    void logLeave(Player *player, QString reason);
     void logKicked();
-    void logTurnReversed(PlayerLogic *player, bool reversed);
+    void logTurnReversed(Player *player, bool reversed);
     void logGameClosed();
-    void logActivePlayer(PlayerLogic *activePlayer);
+    void logActivePlayer(Player *activePlayer);
     void logActivePhaseChanged(int activePhase);
     void logConcede(int playerId);
     void logUnconcede(int playerId);
diff --git a/cockatrice/src/game/game_meta_info.h b/cockatrice/src/game/game_meta_info.h
index cdba1605f..b5f5bfe4f 100644
--- a/cockatrice/src/game/game_meta_info.h
+++ b/cockatrice/src/game/game_meta_info.h
@@ -1,8 +1,8 @@
 /**
  * @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
@@ -87,17 +87,15 @@ 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_graphics/game_scene.cpp b/cockatrice/src/game/game_scene.cpp
similarity index 63%
rename from cockatrice/src/game_graphics/game_scene.cpp
rename to cockatrice/src/game/game_scene.cpp
index b9816a602..034ff6947 100644
--- a/cockatrice/src/game_graphics/game_scene.cpp
+++ b/cockatrice/src/game/game_scene.cpp
@@ -1,15 +1,10 @@
 #include "game_scene.h"
 
 #include "../client/settings/cache_settings.h"
-#include "../game/abstract_game.h"
-#include "../game/player/player_actions.h"
-#include "../game/player/player_logic.h"
-#include "../game_graphics/player/player_graphics_item.h"
 #include "board/card_item.h"
 #include "phases_toolbar.h"
-#include "player/menu/player_menu.h"
+#include "player/player.h"
 #include "player/player_graphics_item.h"
-#include "zones/select_zone.h"
 #include "zones/view_zone.h"
 #include "zones/view_zone_widget.h"
 
@@ -59,95 +54,8 @@ GameScene::~GameScene()
  */
 void GameScene::retranslateUi()
 {
-    for (ZoneViewWidget *view : zoneViews) {
+    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());
 }
 
 /**
@@ -156,34 +64,13 @@ void GameScene::hideSelected(AbstractCardItem *card)
  *
  * Connects to the player's sizeChanged signal to recompute layout on resize.
  */
-void GameScene::addPlayer(PlayerLogic *player)
+void GameScene::addPlayer(Player *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();
+    players << player->getGraphicsItem();
+    addItem(player->getGraphicsItem());
+    connect(player->getGraphicsItem(), &PlayerGraphicsItem::sizeChanged, this, &GameScene::rearrange);
 }
 
 /**
@@ -192,20 +79,17 @@ void GameScene::addPlayer(PlayerLogic *player)
  *
  * Closes any zone views associated with the player and recomputes layout.
  */
-void GameScene::removePlayer(PlayerLogic *player)
+void GameScene::removePlayer(Player *player)
 {
     qCInfo(GameScenePlayerAdditionRemovalLog) << "GameScene::removePlayer name=" << player->getPlayerInfo()->getName();
 
-    clearArrowsForPlayer(player->getPlayerInfo()->getId());
-
     for (ZoneViewWidget *zone : zoneViews) {
         if (zone->getPlayer() == player) {
             zone->close();
         }
     }
-    auto *view = playerViews.take(player->getPlayerInfo()->getId());
-    removeItem(view);
-    view->deleteLater();
+    players.removeOne(player->getGraphicsItem());
+    removeItem(player->getGraphicsItem());
     rearrange();
 }
 
@@ -280,14 +164,14 @@ void GameScene::processViewSizeChange(const QSize &newSize)
  *
  * Used to determine rotation and layout order.
  */
-QList<PlayerLogic *> GameScene::collectActivePlayers(int &firstPlayerIndex) const
+QList<Player *> GameScene::collectActivePlayers(int &firstPlayerIndex) const
 {
-    QList<PlayerLogic *> activePlayers;
+    QList<Player *> activePlayers;
     firstPlayerIndex = 0;
     bool firstPlayerFound = false;
 
-    for (auto *pgItem : playerViews.values()) {
-        PlayerLogic *p = pgItem->getLogic();
+    for (auto *pgItem : players) {
+        Player *p = pgItem->getPlayer();
         if (p && !p->getConceded()) {
             activePlayers.append(p);
             if (!firstPlayerFound && p->getPlayerInfo()->getLocal()) {
@@ -307,17 +191,15 @@ QList<PlayerLogic *> GameScene::collectActivePlayers(int &firstPlayerIndex) cons
  *
  * Applies rotation offset and ensures the list wraps correctly.
  */
-QList<PlayerLogic *> GameScene::rotatePlayers(const QList<PlayerLogic *> &activePlayers, int firstPlayerIndex) const
+QList<Player *> GameScene::rotatePlayers(const QList<Player *> &activePlayers, int firstPlayerIndex) const
 {
-    QList<PlayerLogic *> rotated = activePlayers;
+    QList<Player *> rotated = activePlayers;
     if (!rotated.isEmpty()) {
         int totalRotation = firstPlayerIndex + playerRotation;
-        while (totalRotation < 0) {
+        while (totalRotation < 0)
             totalRotation += rotated.size();
-        }
-        for (int i = 0; i < totalRotation; ++i) {
+        for (int i = 0; i < totalRotation; ++i)
             rotated.append(rotated.takeFirst());
-        }
     }
     return rotated;
 }
@@ -340,7 +222,7 @@ int GameScene::determineColumnCount(int playerCount)
  * - Position players in columns with spacing.
  * - Mirror graphics for visual balance.
  */
-QSizeF GameScene::computeSceneSizeAndPlayerLayout(const QList<PlayerLogic *> &playersPlaying, int columns)
+QSizeF GameScene::computeSceneSizeAndPlayerLayout(const QList<Player *> &playersPlaying, int columns)
 {
     playersByColumn.clear();
 
@@ -348,7 +230,7 @@ QSizeF GameScene::computeSceneSizeAndPlayerLayout(const QList<PlayerLogic *> &pl
     qreal sceneHeight = 0, sceneWidth = -playerAreaSpacing;
     QList<int> columnWidth;
 
-    QListIterator<PlayerLogic *> playersIter(playersPlaying);
+    QListIterator<Player *> playersIter(playersPlaying);
     for (int col = 0; col < columns; ++col) {
         playersByColumn.append(QList<PlayerGraphicsItem *>());
         columnWidth.append(0);
@@ -356,14 +238,13 @@ QSizeF GameScene::computeSceneSizeAndPlayerLayout(const QList<PlayerLogic *> &pl
         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()));
-            }
+            Player *player = playersIter.next();
+            if (col == 0)
+                playersByColumn[col].prepend(player->getGraphicsItem());
+            else
+                playersByColumn[col].append(player->getGraphicsItem());
 
-            auto *pgItem = playerViews.value(player->getPlayerInfo()->getId());
+            auto *pgItem = player->getGraphicsItem();
             thisColumnHeight += pgItem->boundingRect().height() + playerAreaSpacing;
             columnWidth[col] = std::max(columnWidth[col], (int)pgItem->boundingRect().width());
         }
@@ -400,9 +281,8 @@ QList<qreal> GameScene::calculateMinWidthByColumn() const
     QList<qreal> minWidthByColumn;
     for (const auto &col : playersByColumn) {
         qreal maxWidth = 0;
-        for (PlayerGraphicsItem *player : col) {
+        for (PlayerGraphicsItem *player : col)
             maxWidth = std::max(maxWidth, player->getMinimumWidth());
-        }
         minWidthByColumn.append(maxWidth);
     }
     return minWidthByColumn;
@@ -450,89 +330,6 @@ void GameScene::resizeColumnsAndPlayers(const QList<qreal> &minWidthByColumn, qr
     }
 }
 
-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);
-    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)) {
-        arrowRegistry.take(playerId, arrowId)->delArrow();
-    }
-}
-
 // ---------- Hover Handling ----------
 
 void GameScene::updateHover(const QPointF &scenePos)
@@ -546,38 +343,18 @@ void GameScene::updateHover(const QPointF &scenePos)
 
 void GameScene::updateHoveredCard(CardItem *newCard)
 {
-    if (hoveredCard && (newCard != hoveredCard)) {
-        endCardHover(hoveredCard);
-    }
-    if (newCard && (newCard != hoveredCard)) {
-        beginCardHover(newCard);
-    }
+    if (hoveredCard && (newCard != hoveredCard))
+        hoveredCard->setHovered(false);
+    if (newCard && (newCard != hoveredCard))
+        newCard->setHovered(true);
     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)) {
+    for (QGraphicsItem *item : items)
+        if (auto *zone = qgraphicsitem_cast<CardZone *>(item))
             return zone;
-        }
-    }
     return nullptr;
 }
 
@@ -588,17 +365,14 @@ CardItem *GameScene::findTopmostCardInZone(const QList<QGraphicsItem *> &items,
 
     for (QGraphicsItem *item : items) {
         CardItem *card = qgraphicsitem_cast<CardItem *>(item);
-        if (!card) {
+        if (!card)
             continue;
-        }
 
         if (card->getAttachedTo()) {
-            if (card->getAttachedTo()->getZone() != zone->getLogic()) {
+            if (card->getAttachedTo()->getZone() != zone->getLogic())
                 continue;
-            }
-        } else if (card->getZone() != zone->getLogic()) {
+        } else if (card->getZone() != zone->getLogic())
             continue;
-        }
 
         if (card->getRealZValue() > maxZ) {
             maxZ = card->getRealZValue();
@@ -620,7 +394,7 @@ CardItem *GameScene::findTopmostCardInZone(const QList<QGraphicsItem *> &items,
  * 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)
+void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numberCards, bool isReversed)
 {
     for (auto &view : zoneViews) {
         ZoneViewZone *temp = view->getZone();
@@ -637,13 +411,12 @@ void GameScene::toggleZoneView(PlayerLogic *player, const QString &zoneName, int
     connect(item, &ZoneViewWidget::closePressed, this, &GameScene::removeZoneView);
     addItem(item);
 
-    if (zoneName == ZoneNames::GRAVE) {
+    if (zoneName == ZoneNames::GRAVE)
         item->setPos(360, 100);
-    } else if (zoneName == ZoneNames::EXILE) {
+    else if (zoneName == ZoneNames::EXILE)
         item->setPos(380, 120);
-    } else {
+    else
         item->setPos(340, 80);
-    }
 }
 
 /**
@@ -653,7 +426,7 @@ void GameScene::toggleZoneView(PlayerLogic *player, const QString &zoneName, int
  * @param cardList List of cards to show.
  * @param withWritePermission Whether edits are allowed.
  */
-void GameScene::addRevealedZoneView(PlayerLogic *player,
+void GameScene::addRevealedZoneView(Player *player,
                                     CardZoneLogic *zone,
                                     const QList<const ServerInfo_Card *> &cardList,
                                     bool withWritePermission)
@@ -680,9 +453,8 @@ void GameScene::removeZoneView(ZoneViewWidget *item)
  */
 void GameScene::clearViews()
 {
-    while (!zoneViews.isEmpty()) {
+    while (!zoneViews.isEmpty())
         zoneViews.first()->close();
-    }
 }
 
 /**
@@ -690,9 +462,8 @@ void GameScene::clearViews()
  */
 void GameScene::closeMostRecentZoneView()
 {
-    if (!zoneViews.isEmpty()) {
+    if (!zoneViews.isEmpty())
         zoneViews.last()->close();
-    }
 }
 
 // ---------- View Transforms ----------
@@ -711,11 +482,8 @@ QTransform GameScene::getViewportTransform() const
 
 bool GameScene::event(QEvent *event)
 {
-    if (event->type() == QEvent::GraphicsSceneMouseMove) {
+    if (event->type() == QEvent::GraphicsSceneMouseMove)
         updateHover(static_cast<QGraphicsSceneMouseEvent *>(event)->scenePos());
-    } else if (event->type() == QEvent::Leave) {
-        updateHoveredCard(nullptr);
-    }
 
     return QGraphicsScene::event(event);
 }
@@ -725,29 +493,25 @@ void GameScene::timerEvent(QTimerEvent * /*event*/)
     QMutableSetIterator<CardItem *> i(cardsToAnimate);
     while (i.hasNext()) {
         i.next();
-        if (!i.value()->animationEvent()) {
+        if (!i.value()->animationEvent())
             i.remove();
-        }
     }
-    if (cardsToAnimate.isEmpty()) {
+    if (cardsToAnimate.isEmpty())
         animationTimer->stop();
-    }
 }
 
 void GameScene::registerAnimationItem(AbstractCardItem *card)
 {
     cardsToAnimate.insert(static_cast<CardItem *>(card));
-    if (!animationTimer->isActive()) {
+    if (!animationTimer->isActive())
         animationTimer->start(10, this);
-    }
 }
 
 void GameScene::unregisterAnimationItem(AbstractCardItem *card)
 {
     cardsToAnimate.remove(static_cast<CardItem *>(card));
-    if (cardsToAnimate.isEmpty()) {
+    if (cardsToAnimate.isEmpty())
         animationTimer->stop();
-    }
 }
 
 // ---------- Rubber Band ----------
diff --git a/cockatrice/src/game_graphics/game_scene.h b/cockatrice/src/game/game_scene.h
similarity index 64%
rename from cockatrice/src/game_graphics/game_scene.h
rename to cockatrice/src/game/game_scene.h
index 74e979556..f08e83aa4 100644
--- a/cockatrice/src/game_graphics/game_scene.h
+++ b/cockatrice/src/game/game_scene.h
@@ -1,10 +1,7 @@
 #ifndef GAMESCENE_H
 #define GAMESCENE_H
 
-#include "../game/arrow_registry.h"
-#include "../game/board/arrow_data.h"
-#include "../game/zones/card_zone_logic.h"
-#include "board/arrow_item.h"
+#include "zones/logic/card_zone_logic.h"
 
 #include <QGraphicsScene>
 #include <QList>
@@ -15,7 +12,7 @@
 inline Q_LOGGING_CATEGORY(GameSceneLog, "game_scene");
 inline Q_LOGGING_CATEGORY(GameScenePlayerAdditionRemovalLog, "game_scene.player_addition_removal");
 
-class PlayerLogic;
+class Player;
 class PlayerGraphicsItem;
 class ZoneViewWidget;
 class CardZone;
@@ -44,9 +41,8 @@ private:
     static const int playerAreaSpacing = 5; ///< Space between player areas
 
     PhasesToolbar *phasesToolbar;                       ///< Toolbar showing game phases
-    QMap<int, PlayerGraphicsItem *> playerViews;        ///< ID lookup for player graphics items
+    QList<PlayerGraphicsItem *> players;                ///< All 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
@@ -60,14 +56,6 @@ 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.
@@ -76,36 +64,23 @@ public:
      */
     explicit GameScene(PhasesToolbar *_phasesToolbar, QObject *parent = nullptr);
 
-    /** @brief Destructor, cleans up timer and zone views. */
+    /** Destructor, cleans up timer and zone views. */
     ~GameScene() override;
 
-    /** @brief Updates UI text for all zone views. */
+    /** 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(PlayerLogic *player);
+    void addPlayer(Player *player);
 
     /**
      * @brief Removes a player from the scene.
      * @param player Player to remove.
      */
-    void removePlayer(PlayerLogic *player);
-
-    QMap<int, PlayerGraphicsItem *> getPlayers() const
-    {
-        return playerViews;
-    }
-
-    PlayerGraphicsItem *viewForPlayer(int playerId)
-    {
-        return playerViews.value(playerId);
-    }
+    void removePlayer(Player *player);
 
     /**
      * @brief Adjusts the global rotation offset for player layout.
@@ -113,7 +88,7 @@ public:
      */
     void adjustPlayerRotation(int rotationAdjustment);
 
-    /** @brief Recomputes the layout of players and the scene size. */
+    /** Recomputes the layout of players and the scene size. */
     void rearrange();
 
     /**
@@ -127,7 +102,7 @@ public:
      * @param firstPlayerIndex Output index of first local player.
      * @return List of active players.
      */
-    QList<PlayerLogic *> collectActivePlayers(int &firstPlayerIndex) const;
+    QList<Player *> collectActivePlayers(int &firstPlayerIndex) const;
 
     /**
      * @brief Rotates the list of players for layout.
@@ -135,7 +110,7 @@ public:
      * @param firstPlayerIndex Index of first local player.
      * @return Rotated list.
      */
-    QList<PlayerLogic *> rotatePlayers(const QList<PlayerLogic *> &players, int firstPlayerIndex) const;
+    QList<Player *> rotatePlayers(const QList<Player *> &players, int firstPlayerIndex) const;
 
     /**
      * @brief Determines the number of columns to display players in.
@@ -150,7 +125,7 @@ public:
      * @param columns Number of columns to split into.
      * @return Calculated scene size.
      */
-    QSizeF computeSceneSizeAndPlayerLayout(const QList<PlayerLogic *> &playersPlaying, int columns);
+    QSizeF computeSceneSizeAndPlayerLayout(const QList<Player *> &playersPlaying, int columns);
 
     /**
      * @brief Computes the minimum width for each column based on player minimum widths.
@@ -173,73 +148,56 @@ public:
      */
     void resizeColumnsAndPlayers(const QList<qreal> &minWidthByColumn, qreal newWidth);
 
-    /** @brief Finds the topmost card zone under the cursor. */
+    /** Finds the topmost card zone under the cursor. */
     static CardZone *findTopmostZone(const QList<QGraphicsItem *> &items);
 
-    /** @brief Finds the topmost card in a given zone, considering attachments and Z-order. */
+    /** Finds the topmost card in a given zone, considering attachments and Z-order. */
     static CardItem *findTopmostCardInZone(const QList<QGraphicsItem *> &items, CardZone *zone);
 
-    /** @brief Updates hovered card highlighting. */
+    /** Updates hovered card highlighting. */
     void updateHoveredCard(CardItem *newCard);
 
-    /** @brief Registers a card for animation updates. */
+    /** Registers a card for animation updates. */
     void registerAnimationItem(AbstractCardItem *card);
 
-    /** @brief Unregisters a card from animation updates. */
+    /** Unregisters a card from animation updates. */
     void unregisterAnimationItem(AbstractCardItem *card);
     void startRubberBand(const QPointF &selectionOrigin);
     void resizeRubberBand(const QPointF &cursorPoint, int selectedCount);
     void stopRubberBand();
 
 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);
+    /** Toggles a zone view for a player. */
+    void toggleZoneView(Player *player, const QString &zoneName, int numberCards, bool isReversed = false);
 
-    /** @brief Adds a revealed zone view (for shown cards). */
-    void addRevealedZoneView(PlayerLogic *player,
+    /** Adds a revealed zone view (for shown cards). */
+    void addRevealedZoneView(Player *player,
                              CardZoneLogic *zone,
                              const QList<const ServerInfo_Card *> &cardList,
                              bool withWritePermission);
 
-    /** @brief Removes a zone view widget from the scene. */
+    /** Removes a zone view widget from the scene. */
     void removeZoneView(ZoneViewWidget *item);
 
-    /** @brief Closes all zone views. */
+    /** Closes all zone views. */
     void clearViews();
 
-    /** @brief Closes the most recently added zone view. */
+    /** 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:
-    /** @brief Handles hover updates. */
+    /** Handles hover updates. */
     bool event(QEvent *event) override;
 
-    /** @brief Handles animation timer updates. */
+    /** Handles animation timer updates. */
     void timerEvent(QTimerEvent *event) override;
 
 signals:
     void sigStartRubberBand(const QPointF &selectionOrigin);
     void sigResizeRubberBand(const QPointF &cursorPoint, int selectedCount);
     void sigStopRubberBand();
-    void arrowDeletionRequested(int creatorId, int arrowId);
 };
 
 #endif
diff --git a/cockatrice/src/game/game_state.h b/cockatrice/src/game/game_state.h
index 5a57d4321..54f6d9276 100644
--- a/cockatrice/src/game/game_state.h
+++ b/cockatrice/src/game/game_state.h
@@ -1,8 +1,8 @@
 /**
  * @file game_state.h
  * @ingroup GameLogic
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COCKATRICE_GAME_STATE_H
 #define COCKATRICE_GAME_STATE_H
diff --git a/cockatrice/src/game_graphics/game_view.cpp b/cockatrice/src/game/game_view.cpp
similarity index 98%
rename from cockatrice/src/game_graphics/game_view.cpp
rename to cockatrice/src/game/game_view.cpp
index 4ba41cffb..ce53828a7 100644
--- a/cockatrice/src/game_graphics/game_view.cpp
+++ b/cockatrice/src/game/game_view.cpp
@@ -75,9 +75,8 @@ void GameView::resizeEvent(QResizeEvent *event)
     QGraphicsView::resizeEvent(event);
 
     GameScene *s = dynamic_cast<GameScene *>(scene());
-    if (s) {
+    if (s)
         s->processViewSizeChange(event->size());
-    }
 
     updateSceneRect(scene()->sceneRect());
     updateTotalSelectionCount(event->size());
@@ -90,9 +89,8 @@ void GameView::updateSceneRect(const QRectF &rect)
 
 void GameView::startRubberBand(const QPointF &_selectionOrigin)
 {
-    if (!rubberBand) {
+    if (!rubberBand)
         return;
-    }
 
     selectionOrigin = _selectionOrigin;
     rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), QSize(0, 0)));
@@ -101,9 +99,8 @@ void GameView::startRubberBand(const QPointF &_selectionOrigin)
 
 void GameView::resizeRubberBand(const QPointF &cursorPoint, int selectedCount)
 {
-    if (!rubberBand) {
+    if (!rubberBand)
         return;
-    }
 
     constexpr int kLabelPaddingInPixels = 4;
 
@@ -148,9 +145,8 @@ void GameView::resizeRubberBand(const QPointF &cursorPoint, int selectedCount)
 
 void GameView::stopRubberBand()
 {
-    if (!rubberBand) {
+    if (!rubberBand)
         return;
-    }
 
     rubberBand->hide();
     dragCountLabel->hide();
diff --git a/cockatrice/src/game_graphics/game_view.h b/cockatrice/src/game/game_view.h
similarity index 96%
rename from cockatrice/src/game_graphics/game_view.h
rename to cockatrice/src/game/game_view.h
index 15abad9af..a77ab9257 100644
--- a/cockatrice/src/game_graphics/game_view.h
+++ b/cockatrice/src/game/game_view.h
@@ -1,8 +1,8 @@
 /**
  * @file game_view.h
  * @ingroup GameGraphics
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef GAMEVIEW_H
 #define GAMEVIEW_H
diff --git a/cockatrice/src/game_graphics/hand_counter.cpp b/cockatrice/src/game/hand_counter.cpp
similarity index 100%
rename from cockatrice/src/game_graphics/hand_counter.cpp
rename to cockatrice/src/game/hand_counter.cpp
diff --git a/cockatrice/src/game_graphics/hand_counter.h b/cockatrice/src/game/hand_counter.h
similarity index 84%
rename from cockatrice/src/game_graphics/hand_counter.h
rename to cockatrice/src/game/hand_counter.h
index 9aa65d514..2c0175ecc 100644
--- a/cockatrice/src/game_graphics/hand_counter.h
+++ b/cockatrice/src/game/hand_counter.h
@@ -1,14 +1,14 @@
 /**
  * @file hand_counter.h
  * @ingroup GameGraphicsPlayers
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef HANDCOUNTER_H
 #define HANDCOUNTER_H
 
-#include "board/abstract_graphics_item.h"
-#include "board/graphics_item_type.h"
+#include "../game_graphics/board/abstract_graphics_item.h"
+#include "../game_graphics/board/graphics_item_type.h"
 
 #include <QString>
 
diff --git a/cockatrice/src/game_graphics/log/message_log_widget.cpp b/cockatrice/src/game/log/message_log_widget.cpp
similarity index 90%
rename from cockatrice/src/game_graphics/log/message_log_widget.cpp
rename to cockatrice/src/game/log/message_log_widget.cpp
index ccd903b04..c38e433eb 100644
--- a/cockatrice/src/game_graphics/log/message_log_widget.cpp
+++ b/cockatrice/src/game/log/message_log_widget.cpp
@@ -1,13 +1,13 @@
 #include "message_log_widget.h"
 
-#include "../../client/settings/card_counter_settings.h"
 #include "../../client/sound_engine.h"
-#include "../../game/phase.h"
-#include "../../game/player/player_logic.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../board/card_item.h"
 #include "../board/translate_counter_name.h"
+#include "../phase.h"
+#include "../player/player.h"
 
+#include <../../client/settings/card_counter_settings.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_mulligan.pb.h>
 #include <libcockatrice/utility/zone_names.h>
@@ -54,7 +54,7 @@ MessageLogWidget::getFromStr(CardZoneLogic *zone, QString cardName, int position
                     fromStr = tr(" from the top of their library");
                 }
             }
-        } else if (position == zone->getCards().size()) {
+        } else if (position >= zone->getCards().size() - 1) {
             if (cardName.isEmpty()) {
                 if (ownerChange) {
                     cardName = tr("the bottom card of %1's library").arg(zone->getPlayer()->getPlayerInfo()->getName());
@@ -105,7 +105,7 @@ void MessageLogWidget::containerProcessingStarted(const GameEventContext &contex
     }
 }
 
-void MessageLogWidget::logAlwaysRevealTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal)
+void MessageLogWidget::logAlwaysRevealTopCard(Player *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."))
@@ -113,7 +113,7 @@ void MessageLogWidget::logAlwaysRevealTopCard(PlayerLogic *player, CardZoneLogic
                                 .arg(zone->getTranslatedName(true, CaseTopCardsOfZone)));
 }
 
-void MessageLogWidget::logAlwaysLookAtTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal)
+void MessageLogWidget::logAlwaysLookAtTopCard(Player *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."))
@@ -121,10 +121,7 @@ void MessageLogWidget::logAlwaysLookAtTopCard(PlayerLogic *player, CardZoneLogic
                                 .arg(zone->getTranslatedName(true, CaseTopCardsOfZone)));
 }
 
-void MessageLogWidget::logAttachCard(PlayerLogic *player,
-                                     QString cardName,
-                                     PlayerLogic *targetPlayer,
-                                     QString targetCardName)
+void MessageLogWidget::logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName)
 {
     appendHtmlServerMessage(tr("%1 attaches %2 to %3's %4.")
                                 .arg(sanitizeHtml(player->getPlayerInfo()->getName()))
@@ -151,7 +148,7 @@ void MessageLogWidget::logUnconcede(int playerId)
         true);
 }
 
-void MessageLogWidget::logConnectionStateChanged(PlayerLogic *player, bool connectionState)
+void MessageLogWidget::logConnectionStateChanged(Player *player, bool connectionState)
 {
     if (connectionState) {
         soundEngine->playSound("player_reconnect");
@@ -164,10 +161,10 @@ void MessageLogWidget::logConnectionStateChanged(PlayerLogic *player, bool conne
     }
 }
 
-void MessageLogWidget::logCreateArrow(PlayerLogic *player,
-                                      PlayerLogic *startPlayer,
+void MessageLogWidget::logCreateArrow(Player *player,
+                                      Player *startPlayer,
                                       QString startCard,
-                                      PlayerLogic *targetPlayer,
+                                      Player *targetPlayer,
                                       QString targetCard,
                                       bool playerTarget)
 {
@@ -223,7 +220,7 @@ void MessageLogWidget::logCreateArrow(PlayerLogic *player,
     }
 }
 
-void MessageLogWidget::logCreateToken(PlayerLogic *player, QString cardName, QString pt, bool faceDown)
+void MessageLogWidget::logCreateToken(Player *player, QString cardName, QString pt, bool faceDown)
 {
     if (faceDown) {
         appendHtmlServerMessage(
@@ -236,7 +233,7 @@ void MessageLogWidget::logCreateToken(PlayerLogic *player, QString cardName, QSt
     }
 }
 
-void MessageLogWidget::logDeckSelect(PlayerLogic *player, QString deckHash, int sideboardSize)
+void MessageLogWidget::logDeckSelect(Player *player, QString deckHash, int sideboardSize)
 {
     if (sideboardSize < 0) {
         appendHtmlServerMessage(
@@ -249,13 +246,13 @@ void MessageLogWidget::logDeckSelect(PlayerLogic *player, QString deckHash, int
     }
 }
 
-void MessageLogWidget::logDestroyCard(PlayerLogic *player, QString cardName)
+void MessageLogWidget::logDestroyCard(Player *player, QString cardName)
 {
     appendHtmlServerMessage(
         tr("%1 destroys %2.").arg(sanitizeHtml(player->getPlayerInfo()->getName())).arg(cardLink(std::move(cardName))));
 }
 
-void MessageLogWidget::logMoveCard(PlayerLogic *player,
+void MessageLogWidget::logMoveCard(Player *player,
                                    CardItem *card,
                                    CardZoneLogic *startZone,
                                    int oldX,
@@ -362,7 +359,7 @@ void MessageLogWidget::logMoveCard(PlayerLogic *player,
     appendHtmlServerMessage(message);
 }
 
-void MessageLogWidget::logDrawCards(PlayerLogic *player, int number, bool deckIsEmpty)
+void MessageLogWidget::logDrawCards(Player *player, int number, bool deckIsEmpty)
 {
     soundEngine->playSound("draw_card");
     if (currentContext == MessageContext_Mulligan) {
@@ -379,7 +376,7 @@ void MessageLogWidget::logDrawCards(PlayerLogic *player, int number, bool deckIs
     }
 }
 
-void MessageLogWidget::logDumpZone(PlayerLogic *player, CardZoneLogic *zone, int numberCards, bool isReversed)
+void MessageLogWidget::logDumpZone(Player *player, CardZoneLogic *zone, int numberCards, bool isReversed)
 {
     if (numberCards == -1) {
         appendHtmlServerMessage(tr("%1 is looking at %2.")
@@ -395,7 +392,7 @@ void MessageLogWidget::logDumpZone(PlayerLogic *player, CardZoneLogic *zone, int
     }
 }
 
-void MessageLogWidget::logFlipCard(PlayerLogic *player, QString cardName, bool faceDown)
+void MessageLogWidget::logFlipCard(Player *player, QString cardName, bool faceDown)
 {
     if (faceDown) {
         appendHtmlServerMessage(
@@ -421,7 +418,7 @@ void MessageLogWidget::logGameFlooded()
     appendMessage(tr("You are flooding the game. Please wait a couple of seconds."));
 }
 
-void MessageLogWidget::logJoin(PlayerLogic *player)
+void MessageLogWidget::logJoin(Player *player)
 {
     soundEngine->playSound("player_join");
     appendHtmlServerMessage(tr("%1 has joined the game.").arg(sanitizeHtml(player->getPlayerInfo()->getName())));
@@ -438,7 +435,7 @@ void MessageLogWidget::logKicked()
     appendHtmlServerMessage(tr("You have been kicked out of the game."), true);
 }
 
-void MessageLogWidget::logLeave(PlayerLogic *player, QString reason)
+void MessageLogWidget::logLeave(Player *player, QString reason)
 {
     soundEngine->playSound("player_leave");
     appendHtmlServerMessage(tr("%1 has left the game (%2).")
@@ -453,13 +450,13 @@ void MessageLogWidget::logLeaveSpectator(QString name, QString reason)
                                 .arg(sanitizeHtml(std::move(name)), sanitizeHtml(std::move(reason))));
 }
 
-void MessageLogWidget::logNotReadyStart(PlayerLogic *player)
+void MessageLogWidget::logNotReadyStart(Player *player)
 {
     appendHtmlServerMessage(
         tr("%1 is not ready to start the game any more.").arg(sanitizeHtml(player->getPlayerInfo()->getName())));
 }
 
-void MessageLogWidget::logMulligan(PlayerLogic *player, int number)
+void MessageLogWidget::logMulligan(Player *player, int number)
 {
     if (!player) {
         return;
@@ -479,16 +476,16 @@ void MessageLogWidget::logReplayStarted(int gameId)
     appendHtmlServerMessage(tr("You are watching a replay of game #%1.").arg(gameId));
 }
 
-void MessageLogWidget::logReadyStart(PlayerLogic *player)
+void MessageLogWidget::logReadyStart(Player *player)
 {
     appendHtmlServerMessage(tr("%1 is ready to start the game.").arg(sanitizeHtml(player->getPlayerInfo()->getName())));
 }
 
-void MessageLogWidget::logRevealCards(PlayerLogic *player,
+void MessageLogWidget::logRevealCards(Player *player,
                                       CardZoneLogic *zone,
                                       int cardId,
                                       QString cardName,
-                                      PlayerLogic *otherPlayer,
+                                      Player *otherPlayer,
                                       bool faceDown,
                                       int amount,
                                       bool isLentToAnotherPlayer)
@@ -571,14 +568,14 @@ void MessageLogWidget::logRevealCards(PlayerLogic *player,
     }
 }
 
-void MessageLogWidget::logReverseTurn(PlayerLogic *player, bool reversed)
+void MessageLogWidget::logReverseTurn(Player *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(PlayerLogic *player, int sides, const QList<uint> &rolls)
+void MessageLogWidget::logRollDie(Player *player, int sides, const QList<uint> &rolls)
 {
     if (rolls.length() == 1) {
         const auto roll = rolls.at(0);
@@ -615,7 +612,7 @@ void MessageLogWidget::logRollDie(PlayerLogic *player, int sides, const QList<ui
     soundEngine->playSound("roll_dice");
 }
 
-void MessageLogWidget::logSay(PlayerLogic *player, QString message)
+void MessageLogWidget::logSay(Player *player, QString message)
 {
     appendMessage(std::move(message), {}, *player->getPlayerInfo()->getUserInfo(), true);
 }
@@ -630,13 +627,13 @@ void MessageLogWidget::logSetActivePhase(int phaseNumber)
                phase.getName() + "</b></font>");
 }
 
-void MessageLogWidget::logSetActivePlayer(PlayerLogic *player)
+void MessageLogWidget::logSetActivePlayer(Player *player)
 {
     appendHtml("<br><font color=\"green\"><b>" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") +
                QString(tr("%1's turn.")).arg(player->getPlayerInfo()->getName()) + "</b></font><br>");
 }
 
-void MessageLogWidget::logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation)
+void MessageLogWidget::logSetAnnotation(Player *player, CardItem *card, QString newAnnotation)
 {
     appendHtmlServerMessage(
         QString(tr("%1 sets annotation of %2 to %3."))
@@ -645,27 +642,25 @@ void MessageLogWidget::logSetAnnotation(PlayerLogic *player, CardItem *card, QSt
             .arg(QString("&quot;<font class=\"blue\">%1</font>&quot;").arg(sanitizeHtml(std::move(newAnnotation)))));
 }
 
-void MessageLogWidget::logSetCardCounter(PlayerLogic *player, QString cardName, int counterId, int value, int oldValue)
+void MessageLogWidget::logSetCardCounter(Player *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%4 counter(s) on %5 (now %6).", "", delta);
+        finalStr = tr("%1 places %2 \"%3\" counter(s) on %4 (now %5).", "", delta);
     } else {
-        finalStr = tr("%1 removes %2 %3%4 counter(s) from %5 (now %6).", "", delta);
+        finalStr = tr("%1 removes %2 \"%3\" counter(s) from %4 (now %5).", "", 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(PlayerLogic *player, QString counterName, int value, int oldValue)
+void MessageLogWidget::logSetCounter(Player *player, QString counterName, int value, int oldValue)
 {
     if (counterName == "life") {
         soundEngine->playSound("life_change");
@@ -680,7 +675,7 @@ void MessageLogWidget::logSetCounter(PlayerLogic *player, QString counterName, i
                                 .arg(value - oldValue));
 }
 
-void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap)
+void MessageLogWidget::logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap)
 {
     QString str;
     if (doesntUntap) {
@@ -691,7 +686,7 @@ void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardItem *card, bo
     appendHtmlServerMessage(str.arg(sanitizeHtml(player->getPlayerInfo()->getName())).arg(cardLink(card->getName())));
 }
 
-void MessageLogWidget::logSetPT(PlayerLogic *player, CardItem *card, QString newPT)
+void MessageLogWidget::logSetPT(Player *player, CardItem *card, QString newPT)
 {
     if (currentContext == MessageContext_MoveCard) {
         return;
@@ -718,7 +713,7 @@ void MessageLogWidget::logSetPT(PlayerLogic *player, CardItem *card, QString new
     }
 }
 
-void MessageLogWidget::logSetSideboardLock(PlayerLogic *player, bool locked)
+void MessageLogWidget::logSetSideboardLock(Player *player, bool locked)
 {
     if (locked) {
         appendHtmlServerMessage(
@@ -729,7 +724,7 @@ void MessageLogWidget::logSetSideboardLock(PlayerLogic *player, bool locked)
     }
 }
 
-void MessageLogWidget::logSetTapped(PlayerLogic *player, CardItem *card, bool tapped)
+void MessageLogWidget::logSetTapped(Player *player, CardItem *card, bool tapped)
 {
     if (currentContext == MessageContext_MoveCard) {
         return;
@@ -752,7 +747,7 @@ void MessageLogWidget::logSetTapped(PlayerLogic *player, CardItem *card, bool ta
     }
 }
 
-void MessageLogWidget::logShuffle(PlayerLogic *player, CardZoneLogic *zone, int start, int end)
+void MessageLogWidget::logShuffle(Player *player, CardZoneLogic *zone, int start, int end)
 {
     if (currentContext == MessageContext_Mulligan) {
         return;
@@ -789,14 +784,14 @@ void MessageLogWidget::logSpectatorSay(const ServerInfo_User &spectator, QString
     appendMessage(std::move(message), {}, spectator, false);
 }
 
-void MessageLogWidget::logUnattachCard(PlayerLogic *player, QString cardName)
+void MessageLogWidget::logUnattachCard(Player *player, QString cardName)
 {
     appendHtmlServerMessage(tr("%1 unattaches %2.")
                                 .arg(sanitizeHtml(player->getPlayerInfo()->getName()))
                                 .arg(cardLink(std::move(cardName))));
 }
 
-void MessageLogWidget::logUndoDraw(PlayerLogic *player, QString cardName)
+void MessageLogWidget::logUndoDraw(Player *player, QString cardName)
 {
     if (cardName.isEmpty()) {
         appendHtmlServerMessage(tr("%1 undoes their last draw.").arg(sanitizeHtml(player->getPlayerInfo()->getName())));
@@ -808,12 +803,6 @@ void MessageLogWidget::logUndoDraw(PlayerLogic *player, QString 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\">");
@@ -847,7 +836,6 @@ 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/log/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h
new file mode 100644
index 000000000..369debd33
--- /dev/null
+++ b/cockatrice/src/game/log/message_log_widget.h
@@ -0,0 +1,108 @@
+/**
+ * @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.h b/cockatrice/src/game/phase.h
index a888ad43b..2e712932f 100644
--- a/cockatrice/src/game/phase.h
+++ b/cockatrice/src/game/phase.h
@@ -1,8 +1,8 @@
 /**
  * @file phase.h
  * @ingroup GameLogic
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef PHASE_H
 #define PHASE_H
diff --git a/cockatrice/src/game_graphics/phases_toolbar.cpp b/cockatrice/src/game/phases_toolbar.cpp
similarity index 95%
rename from cockatrice/src/game_graphics/phases_toolbar.cpp
rename to cockatrice/src/game/phases_toolbar.cpp
index 3361f9d55..2341a1d7f 100644
--- a/cockatrice/src/game_graphics/phases_toolbar.cpp
+++ b/cockatrice/src/game/phases_toolbar.cpp
@@ -21,9 +21,8 @@ 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);
 }
@@ -64,9 +63,8 @@ void PhaseButton::setWidth(double _width)
 
 void PhaseButton::setActive(bool _active)
 {
-    if ((active == _active) || !highlightable) {
+    if ((active == _active) || !highlightable)
         return;
-    }
 
     active = _active;
     activeAnimationTimer->start(25);
@@ -74,9 +72,8 @@ 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) {
@@ -102,9 +99,8 @@ void PhaseButton::mouseDoubleClickEvent(QGraphicsSceneMouseEvent * /*event*/)
 
 void PhaseButton::triggerDoubleClickAction()
 {
-    if (doubleClickAction) {
+    if (doubleClickAction)
         doubleClickAction->trigger();
-    }
 }
 
 PhasesToolbar::PhasesToolbar(QGraphicsItem *parent)
@@ -130,9 +126,8 @@ 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);
@@ -149,9 +144,8 @@ 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
@@ -193,9 +187,8 @@ 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;
@@ -233,13 +226,11 @@ 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)
@@ -252,9 +243,8 @@ 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)));
diff --git a/cockatrice/src/game_graphics/phases_toolbar.h b/cockatrice/src/game/phases_toolbar.h
similarity index 96%
rename from cockatrice/src/game_graphics/phases_toolbar.h
rename to cockatrice/src/game/phases_toolbar.h
index 39884ef75..215a97dd1 100644
--- a/cockatrice/src/game_graphics/phases_toolbar.h
+++ b/cockatrice/src/game/phases_toolbar.h
@@ -2,13 +2,13 @@
  * @file phases_toolbar.h
  * @ingroup GameGraphics
  * @ingroup GameWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef PHASESTOOLBAR_H
 #define PHASESTOOLBAR_H
 
-#include "board/abstract_graphics_item.h"
+#include "../game_graphics/board/abstract_graphics_item.h"
 
 #include <QFrame>
 #include <QGraphicsObject>
@@ -21,7 +21,7 @@ namespace protobuf
 class Message;
 }
 } // namespace google
-class PlayerLogic;
+class Player;
 class GameCommand;
 
 class PhaseButton : public QObject, public QGraphicsItem
diff --git a/cockatrice/src/game_graphics/player/card_menu_action_type.h b/cockatrice/src/game/player/card_menu_action_type.h
similarity index 64%
rename from cockatrice/src/game_graphics/player/card_menu_action_type.h
rename to cockatrice/src/game/player/card_menu_action_type.h
index 4cae22716..aec6d6397 100644
--- a/cockatrice/src/game_graphics/player/card_menu_action_type.h
+++ b/cockatrice/src/game/player/card_menu_action_type.h
@@ -1,28 +1,25 @@
 /**
  * @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,
-    cmMoveToTable
+    cmMoveToExile
 };
 
 #endif // COCKATRICE_CARD_MENU_ACTION_TYPE_H
diff --git a/cockatrice/src/game/player/event_processing_options.h b/cockatrice/src/game/player/event_processing_options.h
index 4c7663789..3e743bdb3 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
diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp
similarity index 70%
rename from cockatrice/src/game_graphics/player/menu/card_menu.cpp
rename to cockatrice/src/game/player/menu/card_menu.cpp
index aa94c3be7..cd77c2968 100644
--- a/cockatrice/src/game_graphics/player/menu/card_menu.cpp
+++ b/cockatrice/src/game/player/menu/card_menu.cpp
@@ -3,121 +3,87 @@
 #include "../../../client/settings/card_counter_settings.h"
 #include "../../../interface/widgets/tabs/tab_game.h"
 #include "../../board/card_item.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/view_zone_logic.h"
+#include "../../zones/logic/view_zone_logic.h"
 #include "../card_menu_action_type.h"
-#include "../player_graphics_item.h"
+#include "../player.h"
+#include "../player_actions.h"
 #include "move_menu.h"
 #include "pt_menu.h"
 
-#include <QPainter>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/utility/zone_names.h>
 
-/**
- * @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)
+CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive)
     : player(_player), card(_card), shortcutsActive(_shortcutsActive)
 {
-    const QList<PlayerLogic *> &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
+    auto playerActions = player->getPlayerActions();
+
+    const QList<Player *> &players = player->getGame()->getPlayerManager()->getPlayers().values();
 
     for (auto playerToAdd : players) {
-        if (playerToAdd == player->getLogic()) {
+        if (playerToAdd == player) {
             continue;
         }
         playersInfo.append(qMakePair(playerToAdd->getPlayerInfo()->getName(), playerToAdd->getPlayerInfo()->getId()));
     }
 
-    connect(player->getLogic()->getGame()->getPlayerManager(), &PlayerManager::playerRemoved, this,
-            &CardMenu::removePlayer);
+    connect(player->getGame()->getPlayerManager(), &PlayerManager::playerRemoved, this, &CardMenu::removePlayer);
 
-    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
+    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);
     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);
 
-    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);
+    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);
 
     aRevealToAll = new QAction(this);
 
     mCardCounters = new QMenu;
 
-    // Card counters
     for (int i = 0; i < 6; ++i) {
-        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);
+        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);
     }
 
     setShortcutsActive();
@@ -129,7 +95,7 @@ CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _sho
     }
 
     bool revealedCard = false;
-    bool writeableCard = player->getLogic()->getPlayerInfo()->getLocalOrJudge();
+    bool writeableCard = player->getPlayerInfo()->getLocalOrJudge();
     if (auto *view = qobject_cast<ZoneViewZoneLogic *>(card->getZone())) {
         if (view->getRevealZone()) {
             if (view->getWriteableRevealZone()) {
@@ -142,7 +108,6 @@ CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _sho
 
     if (revealedCard) {
         addAction(aHide);
-        addSeparator();
         addAction(aClone);
         addSeparator();
         addAction(aSelectAll);
@@ -166,7 +131,7 @@ CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _sho
     }
 }
 
-void CardMenu::removePlayer(PlayerLogic *playerToRemove)
+void CardMenu::removePlayer(Player *playerToRemove)
 {
     for (auto it = playersInfo.begin(); it != playersInfo.end();) {
         if (it->second == playerToRemove->getPlayerInfo()->getId()) {
@@ -181,16 +146,16 @@ void CardMenu::createTableMenu(bool canModifyCard)
 {
     // Card is on the battlefield
     if (!canModifyCard) {
+        addRelatedCardView();
+        addRelatedCardActions();
+
+        addSeparator();
         addAction(aDrawArrow);
         addSeparator();
         addAction(aClone);
         addSeparator();
-        addAction(aReduceLifeByPower);
-        addSeparator();
         addAction(aSelectAll);
         addAction(aSelectRow);
-        addRelatedCardView();
-        addRelatedCardActions();
         return;
     }
 
@@ -200,9 +165,10 @@ void CardMenu::createTableMenu(bool canModifyCard)
     if (card->getFaceDown()) {
         addAction(aPeek);
     }
-    addSeparator();
-    addAction(aClone);
-    addMenu(new MoveMenu(player));
+
+    addRelatedCardView();
+    addRelatedCardActions();
+
     addSeparator();
     addAction(aAttach);
     if (card->getAttachedTo()) {
@@ -213,7 +179,8 @@ void CardMenu::createTableMenu(bool canModifyCard)
     addMenu(new PtMenu(player));
     addAction(aSetAnnotation);
     addSeparator();
-    addAction(aReduceLifeByPower);
+    addAction(aClone);
+    addMenu(new MoveMenu(player));
     addSeparator();
     addAction(aSelectAll);
     addAction(aSelectRow);
@@ -230,34 +197,27 @@ void CardMenu::createTableMenu(bool canModifyCard)
     }
     addSeparator();
     addMenu(mCardCounters);
-    addRelatedCardView();
-    addRelatedCardActions();
 }
 
 void CardMenu::createStackMenu(bool canModifyCard)
 {
     // Card is on the stack
-    if (!canModifyCard) {
+    if (canModifyCard) {
+        addAction(aAttach);
+        addAction(aDrawArrow);
+        addSeparator();
+        addAction(aClone);
+        addMenu(new MoveMenu(player));
+        addSeparator();
+        addAction(aSelectAll);
+    } else {
         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();
 }
@@ -265,29 +225,29 @@ void CardMenu::createStackMenu(bool canModifyCard)
 void CardMenu::createGraveyardOrExileMenu(bool canModifyCard)
 {
     // Card is in the graveyard or exile
-    if (!canModifyCard) {
-        addAction(aDrawArrow);
+    if (canModifyCard) {
+        addAction(aPlay);
+        addAction(aPlayFacedown);
+
         addSeparator();
+        addAction(aClone);
+        addMenu(new MoveMenu(player));
+        addSeparator();
+        addAction(aSelectAll);
+        addAction(aSelectColumn);
+
+        addSeparator();
+        addAction(aAttach);
+        addAction(aDrawArrow);
+    } else {
         addAction(aClone);
         addSeparator();
         addAction(aSelectAll);
         addAction(aSelectColumn);
-        addRelatedCardView();
-        addRelatedCardActions();
-        return;
+        addSeparator();
+        addAction(aDrawArrow);
     }
 
-    addAction(aPlay);
-    addAction(aPlayFacedown);
-    addSeparator();
-    addAction(aClone);
-    addMenu(new MoveMenu(player));
-    addSeparator();
-    addAction(aAttach);
-    addAction(aDrawArrow);
-    addSeparator();
-    addAction(aSelectAll);
-    addAction(aSelectColumn);
     addRelatedCardView();
     addRelatedCardActions();
 }
@@ -297,11 +257,12 @@ void CardMenu::createHandOrCustomZoneMenu(bool canModifyCard)
     if (!canModifyCard) {
         addAction(aDrawArrow);
         addSeparator();
+        addRelatedCardView();
+        addRelatedCardActions();
+        addSeparator();
         addAction(aClone);
         addSeparator();
         addAction(aSelectAll);
-        addRelatedCardView();
-        addRelatedCardActions();
         return;
     }
 
@@ -313,9 +274,7 @@ void CardMenu::createHandOrCustomZoneMenu(bool canModifyCard)
 
     initContextualPlayersMenu(revealMenu, aRevealToAll);
 
-    connect(revealMenu, &QMenu::triggered, this, [this](QAction *action) {
-        player->getLogic()->getPlayerActions()->actReveal(player->getGameScene()->selectedCards(), action);
-    });
+    connect(revealMenu, &QMenu::triggered, player->getPlayerActions(), &PlayerActions::actReveal);
 
     addSeparator();
     addAction(aClone);
@@ -400,7 +359,8 @@ void CardMenu::addRelatedCardView()
         QAction *viewCard = viewRelatedCards->addAction(relatedCardName);
         Q_UNUSED(viewCard);
 
-        connect(viewCard, &QAction::triggered, this, [this, cardRef] { emit cardInfoRequested(cardRef); });
+        connect(viewCard, &QAction::triggered, player->getGame(),
+                [this, cardRef] { player->getGame()->getTab()->viewCardInfo(cardRef); });
     }
 }
 
@@ -462,8 +422,7 @@ void CardMenu::addRelatedCardActions()
 
         auto *createRelated = new QAction(text, this);
         createRelated->setData(QVariant(index++));
-        connect(createRelated, &QAction::triggered, player->getLogic()->getPlayerActions(),
-                &PlayerActions::actCreateRelatedCard);
+        connect(createRelated, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actCreateRelatedCard);
         addAction(createRelated);
     }
 
@@ -472,7 +431,7 @@ void CardMenu::addRelatedCardActions()
             createRelatedCards->setShortcuts(
                 SettingsCache::instance().shortcuts().getShortcut("Player/aCreateRelatedTokens"));
         }
-        connect(createRelatedCards, &QAction::triggered, player->getLogic()->getPlayerActions(),
+        connect(createRelatedCards, &QAction::triggered, player->getPlayerActions(),
                 &PlayerActions::actCreateAllRelatedCards);
         addAction(createRelatedCards);
     }
@@ -490,7 +449,7 @@ void CardMenu::retranslateUi()
     aRevealToAll->setText(tr("&All players"));
     //: Turn sideways or back again
     aTap->setText(tr("&Tap / Untap"));
-    aDoesntUntap->setText(tr("Skip &untapping"));
+    aDoesntUntap->setText(tr("Toggle &normal 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
@@ -501,7 +460,6 @@ 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"));
 
@@ -536,7 +494,6 @@ 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_graphics/player/menu/card_menu.h b/cockatrice/src/game/player/menu/card_menu.h
similarity index 75%
rename from cockatrice/src/game_graphics/player/menu/card_menu.h
rename to cockatrice/src/game/player/menu/card_menu.h
index d67ef3876..b7f2f8241 100644
--- a/cockatrice/src/game_graphics/player/menu/card_menu.h
+++ b/cockatrice/src/game/player/menu/card_menu.h
@@ -1,28 +1,23 @@
 /**
  * @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 <QMenu>
-#include <libcockatrice/utility/card_ref.h>
 
 class CardItem;
-class PlayerGraphicsItem;
-class PlayerLogic;
+class Player;
 class CardMenu : public QMenu
 {
     Q_OBJECT
 
-signals:
-    void cardInfoRequested(const CardRef &cardRef);
-
 public:
-    explicit CardMenu(PlayerGraphicsItem *player, const CardItem *card, bool shortcutsActive);
-    void removePlayer(PlayerLogic *playerToRemove);
+    explicit CardMenu(Player *player, const CardItem *card, bool shortcutsActive);
+    void removePlayer(Player *playerToRemove);
     void createTableMenu(bool canModifyCard);
     void createStackMenu(bool canModifyCard);
     void createGraveyardOrExileMenu(bool canModifyCard);
@@ -41,12 +36,11 @@ public:
     QAction *aFlip, *aPeek;
     QAction *aAttach, *aUnattach;
     QAction *aSetAnnotation;
-    QAction *aReduceLifeByPower;
 
     QList<QAction *> aAddCounter, aSetCounter, aRemoveCounter;
 
 private:
-    PlayerGraphicsItem *player;
+    Player *player;
     const CardItem *card;
     QList<QPair<QString, int>> playersInfo;
     bool shortcutsActive;
diff --git a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp b/cockatrice/src/game/player/menu/custom_zone_menu.cpp
similarity index 63%
rename from cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
rename to cockatrice/src/game/player/menu/custom_zone_menu.cpp
index 743746cc8..b0f3284c9 100644
--- a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
+++ b/cockatrice/src/game/player/menu/custom_zone_menu.cpp
@@ -1,14 +1,13 @@
 #include "custom_zone_menu.h"
 
-#include "../../game/player/player_logic.h"
-#include "../player_graphics_item.h"
+#include "../player.h"
 
-CustomZoneMenu::CustomZoneMenu(PlayerGraphicsItem *_player) : player(_player)
+CustomZoneMenu::CustomZoneMenu(Player *_player) : player(_player)
 {
     menuAction()->setVisible(false);
 
-    connect(player->getLogic(), &PlayerLogic::clearCustomZonesMenu, this, &CustomZoneMenu::clearCustomZonesMenu);
-    connect(player->getLogic(), &PlayerLogic::addViewCustomZoneActionToCustomZoneMenu, this,
+    connect(player, &Player::clearCustomZonesMenu, this, &CustomZoneMenu::clearCustomZonesMenu);
+    connect(player, &Player::addViewCustomZoneActionToCustomZoneMenu, this,
             &CustomZoneMenu::addViewCustomZoneActionToCustomZoneMenu);
 
     retranslateUi();
@@ -18,7 +17,7 @@ void CustomZoneMenu::retranslateUi()
 {
     setTitle(tr("C&ustom Zones"));
 
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getPlayerInfo()->getLocalOrJudge()) {
 
         for (auto aViewZone : actions()) {
             aViewZone->setText(tr("View custom zone '%1'").arg(aViewZone->data().toString()));
@@ -38,5 +37,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->getLogic(), zoneName, -1); });
+            [zoneName, this]() { player->getGameScene()->toggleZoneView(player, zoneName, -1); });
 }
\ No newline at end of file
diff --git a/cockatrice/src/game/player/menu/custom_zone_menu.h b/cockatrice/src/game/player/menu/custom_zone_menu.h
new file mode 100644
index 000000000..0944029f4
--- /dev/null
+++ b/cockatrice/src/game/player/menu/custom_zone_menu.h
@@ -0,0 +1,27 @@
+/**
+ * @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_graphics/player/menu/grave_menu.cpp b/cockatrice/src/game/player/menu/grave_menu.cpp
similarity index 79%
rename from cockatrice/src/game_graphics/player/menu/grave_menu.cpp
rename to cockatrice/src/game/player/menu/grave_menu.cpp
index 698481f7a..2af62c08a 100644
--- a/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
+++ b/cockatrice/src/game/player/menu/grave_menu.cpp
@@ -1,22 +1,21 @@
 #include "grave_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 "../../abstract_game.h"
+#include "../player.h"
+#include "../player_actions.h"
 
 #include <QAction>
 #include <QMenu>
 #include <libcockatrice/utility/zone_names.h>
 
-GraveyardMenu::GraveyardMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
+GraveyardMenu::GraveyardMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createMoveActions();
     createViewActions();
 
     addAction(aViewGraveyard);
 
-    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
+    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
         mRevealRandomGraveyardCard = addMenu(QString());
         connect(mRevealRandomGraveyardCard, &QMenu::aboutToShow, this,
                 &GraveyardMenu::populateRevealRandomMenuWithActivePlayers);
@@ -37,9 +36,9 @@ GraveyardMenu::GraveyardMenu(PlayerGraphicsItem *_player, QWidget *parent) : Tea
 
 void GraveyardMenu::createMoveActions()
 {
-    auto grave = player->getLogic()->getGraveZone();
+    auto grave = player->getGraveZone();
 
-    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
+    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
         aMoveGraveToTopLibrary = new QAction(this);
         aMoveGraveToTopLibrary->setData(QList<QVariant>() << ZoneNames::DECK << 0);
 
@@ -61,7 +60,7 @@ void GraveyardMenu::createMoveActions()
 
 void GraveyardMenu::createViewActions()
 {
-    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
+    PlayerActions *playerActions = player->getPlayerActions();
 
     aViewGraveyard = new QAction(this);
     connect(aViewGraveyard, &QAction::triggered, playerActions, &PlayerActions::actViewGraveyard);
@@ -77,11 +76,10 @@ void GraveyardMenu::populateRevealRandomMenuWithActivePlayers()
 
     mRevealRandomGraveyardCard->addSeparator();
 
-    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player->getLogic()) {
+        if (other == player)
             continue;
-        }
         QAction *a = mRevealRandomGraveyardCard->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &GraveyardMenu::onRevealRandomTriggered);
@@ -91,7 +89,7 @@ void GraveyardMenu::populateRevealRandomMenuWithActivePlayers()
 void GraveyardMenu::onRevealRandomTriggered()
 {
     if (auto *a = qobject_cast<QAction *>(sender())) {
-        player->getLogic()->getPlayerActions()->actRevealRandomGraveyardCard(a->data().toInt());
+        player->getPlayerActions()->actRevealRandomGraveyardCard(a->data().toInt());
     }
 }
 
@@ -101,7 +99,7 @@ void GraveyardMenu::retranslateUi()
 
     aViewGraveyard->setText(tr("&View graveyard"));
 
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->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_graphics/player/menu/grave_menu.h b/cockatrice/src/game/player/menu/grave_menu.h
similarity index 66%
rename from cockatrice/src/game_graphics/player/menu/grave_menu.h
rename to cockatrice/src/game/player/menu/grave_menu.h
index 116261e9b..faaf497b6 100644
--- a/cockatrice/src/game_graphics/player/menu/grave_menu.h
+++ b/cockatrice/src/game/player/menu/grave_menu.h
@@ -1,34 +1,33 @@
 /**
  * @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>
 
-class PlayerGraphicsItem;
-class GraveyardMenu : public TearOffMenu, public AbstractPlayerComponent
+class Player;
+class GraveyardMenu : public TearOffMenu
 {
     Q_OBJECT
 signals:
     void newPlayerActionCreated(QAction *action);
 
 public:
-    explicit GraveyardMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr);
+    explicit GraveyardMenu(Player *player, QWidget *parent = nullptr);
     void createMoveActions();
     void createViewActions();
     void populateRevealRandomMenuWithActivePlayers();
     void onRevealRandomTriggered();
-    void retranslateUi() override;
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
+    void retranslateUi();
+    void setShortcutsActive();
+    void setShortcutsInactive();
 
     QMenu *mRevealRandomGraveyardCard = nullptr;
     QMenu *moveGraveMenu = nullptr;
@@ -40,7 +39,7 @@ public:
     QAction *aMoveGraveToRfg = nullptr;
 
 private:
-    PlayerGraphicsItem *player;
+    Player *player;
 };
 
 #endif // COCKATRICE_GRAVE_MENU_H
diff --git a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp b/cockatrice/src/game/player/menu/hand_menu.cpp
similarity index 85%
rename from cockatrice/src/game_graphics/player/menu/hand_menu.cpp
rename to cockatrice/src/game/player/menu/hand_menu.cpp
index ba0702f07..d65c136bf 100644
--- a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
+++ b/cockatrice/src/game/player/menu/hand_menu.cpp
@@ -2,23 +2,19 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game_graphics/zones/hand_zone.h"
-#include "../../game/abstract_game.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../player_graphics_item.h"
+#include "../../abstract_game.h"
+#include "../../zones/hand_zone.h"
+#include "../player.h"
+#include "../player_actions.h"
 
 #include <QAction>
 #include <QMenu>
 #include <libcockatrice/utility/zone_names.h>
 
-HandMenu::HandMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
+HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
-    auto *actions = player->getLogic()->getPlayerActions();
-
-    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
+    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
         aViewHand = new QAction(this);
-
         connect(aViewHand, &QAction::triggered, actions, &PlayerActions::actViewHand);
         addAction(aViewHand);
 
@@ -62,7 +58,7 @@ HandMenu::HandMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(p
     addSeparator();
 
     aMulligan = new QAction(this);
-    connect(aMulligan, &QAction::triggered, actions, &PlayerActions::actRequestMulliganDialog);
+    connect(aMulligan, &QAction::triggered, actions, &PlayerActions::actMulligan);
     addAction(aMulligan);
 
     // Mulligan same size
@@ -79,7 +75,7 @@ HandMenu::HandMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(p
 
     mMoveHandMenu = addTearOffMenu(QString());
 
-    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
+    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
         aMoveHandToTopLibrary = new QAction(this);
         aMoveHandToTopLibrary->setData(QList<QVariant>() << ZoneNames::DECK << 0);
         aMoveHandToBottomLibrary = new QAction(this);
@@ -89,7 +85,7 @@ HandMenu::HandMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(p
         aMoveHandToRfg = new QAction(this);
         aMoveHandToRfg->setData(QList<QVariant>() << ZoneNames::EXILE << 0);
 
-        auto hand = player->getLogic()->getHandZone();
+        auto hand = player->getHandZone();
 
         connect(aMoveHandToTopLibrary, &QAction::triggered, hand, &HandZoneLogic::moveAllToZone);
         connect(aMoveHandToBottomLibrary, &QAction::triggered, hand, &HandZoneLogic::moveAllToZone);
@@ -111,7 +107,7 @@ void HandMenu::retranslateUi()
 {
     setTitle(tr("&Hand"));
 
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getPlayerInfo()->getLocalOrJudge()) {
         aViewHand->setText(tr("&View hand"));
 
         mSortHand->setTitle(tr("Sort hand by..."));
@@ -170,11 +166,10 @@ void HandMenu::populateRevealHandMenuWithActivePlayers()
 
     mRevealHand->addSeparator();
 
-    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player->getLogic()) {
+        if (other == player)
             continue;
-        }
         QAction *a = mRevealHand->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &HandMenu::onRevealHandTriggered);
@@ -189,11 +184,10 @@ void HandMenu::populateRevealRandomHandCardMenuWithActivePlayers()
 
     mRevealRandomHandCard->addSeparator();
 
-    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player->getLogic()) {
+        if (other == player)
             continue;
-        }
         QAction *a = mRevealRandomHandCard->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &HandMenu::onRevealRandomHandCardTriggered);
@@ -203,21 +197,19 @@ void HandMenu::populateRevealRandomHandCardMenuWithActivePlayers()
 void HandMenu::onRevealHandTriggered()
 {
     auto *action = qobject_cast<QAction *>(sender());
-    if (!action) {
+    if (!action)
         return;
-    }
 
     const int targetId = action->data().toInt();
-    player->getLogic()->getPlayerActions()->actRevealHand(targetId);
+    player->getPlayerActions()->actRevealHand(targetId);
 }
 
 void HandMenu::onRevealRandomHandCardTriggered()
 {
     auto *action = qobject_cast<QAction *>(sender());
-    if (!action) {
+    if (!action)
         return;
-    }
 
     const int targetId = action->data().toInt();
-    player->getLogic()->getPlayerActions()->actRevealRandomHandCard(targetId);
+    player->getPlayerActions()->actRevealRandomHandCard(targetId);
 }
diff --git a/cockatrice/src/game_graphics/player/menu/hand_menu.h b/cockatrice/src/game/player/menu/hand_menu.h
similarity index 78%
rename from cockatrice/src/game_graphics/player/menu/hand_menu.h
rename to cockatrice/src/game/player/menu/hand_menu.h
index d5204612b..51e071a62 100644
--- a/cockatrice/src/game_graphics/player/menu/hand_menu.h
+++ b/cockatrice/src/game/player/menu/hand_menu.h
@@ -1,27 +1,26 @@
 /**
  * @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>
 
-class PlayerGraphicsItem;
+class Player;
 class PlayerActions;
 
-class HandMenu : public TearOffMenu, public AbstractPlayerComponent
+class HandMenu : public TearOffMenu
 {
     Q_OBJECT
 
 public:
-    HandMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr);
+    HandMenu(Player *player, PlayerActions *actions, QWidget *parent = nullptr);
 
     QMenu *revealHandMenu() const
     {
@@ -32,9 +31,9 @@ public:
         return mRevealRandomHandCard;
     }
 
-    void retranslateUi() override;
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
+    void retranslateUi();
+    void setShortcutsActive();
+    void setShortcutsInactive();
 
 private slots:
     void populateRevealHandMenuWithActivePlayers();
@@ -43,7 +42,7 @@ private slots:
     void onRevealRandomHandCardTriggered();
 
 private:
-    PlayerGraphicsItem *player;
+    Player *player;
 
     QAction *aViewHand = nullptr;
     QAction *aMulligan = nullptr;
diff --git a/cockatrice/src/game_graphics/player/menu/library_menu.cpp b/cockatrice/src/game/player/menu/library_menu.cpp
similarity index 86%
rename from cockatrice/src/game_graphics/player/menu/library_menu.cpp
rename to cockatrice/src/game/player/menu/library_menu.cpp
index 4c15e09ec..1bb647d06 100644
--- a/cockatrice/src/game_graphics/player/menu/library_menu.cpp
+++ b/cockatrice/src/game/player/menu/library_menu.cpp
@@ -3,16 +3,14 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../../interface/widgets/tabs/tab_game.h"
-#include "../../game/abstract_game.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../player_graphics_item.h"
+#include "../../abstract_game.h"
+#include "../player.h"
+#include "../player_actions.h"
 
 #include <QAction>
-#include <QGraphicsView>
 #include <QMenu>
 
-LibraryMenu::LibraryMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
+LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createDrawActions();
     createShuffleActions();
@@ -77,8 +75,8 @@ LibraryMenu::LibraryMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOff
     bottomLibraryMenu->addSeparator();
     bottomLibraryMenu->addAction(aShuffleBottomCards);
 
-    connect(player->getLogic(), &PlayerLogic::resetTopCardMenuActions, this, &LibraryMenu::resetTopCardMenuActions);
-    connect(player->getLogic(), &PlayerLogic::deckChanged, this, &LibraryMenu::enableOpenInDeckEditorAction);
+    connect(player, &Player::resetTopCardMenuActions, this, &LibraryMenu::resetTopCardMenuActions);
+    connect(player, &Player::deckChanged, this, &LibraryMenu::enableOpenInDeckEditorAction);
 
     retranslateUi();
 }
@@ -96,41 +94,41 @@ void LibraryMenu::resetTopCardMenuActions()
 
 void LibraryMenu::createDrawActions()
 {
-    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
+    PlayerActions *playerActions = player->getPlayerActions();
 
-    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
+    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
         aDrawCard = new QAction(this);
         connect(aDrawCard, &QAction::triggered, playerActions, &PlayerActions::actDrawCard);
         aDrawCards = new QAction(this);
-        connect(aDrawCards, &QAction::triggered, playerActions, &PlayerActions::actRequestDrawCardsDialog);
+        connect(aDrawCards, &QAction::triggered, playerActions, &PlayerActions::actDrawCards);
         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::actRequestDrawBottomCardsDialog);
+        connect(aDrawBottomCards, &QAction::triggered, playerActions, &PlayerActions::actDrawBottomCards);
     }
 }
 
 void LibraryMenu::createShuffleActions()
 {
-    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
+    PlayerActions *playerActions = player->getPlayerActions();
 
-    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
+    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
         aShuffle = new QAction(this);
         connect(aShuffle, &QAction::triggered, playerActions, &PlayerActions::actShuffle);
         aShuffleTopCards = new QAction(this);
-        connect(aShuffleTopCards, &QAction::triggered, playerActions, &PlayerActions::actRequestShuffleTopDialog);
+        connect(aShuffleTopCards, &QAction::triggered, playerActions, &PlayerActions::actShuffleTop);
         aShuffleBottomCards = new QAction(this);
-        connect(aShuffleBottomCards, &QAction::triggered, playerActions, &PlayerActions::actRequestShuffleBottomDialog);
+        connect(aShuffleBottomCards, &QAction::triggered, playerActions, &PlayerActions::actShuffleBottom);
     }
 }
 
 void LibraryMenu::createMoveActions()
 {
-    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
+    PlayerActions *playerActions = player->getPlayerActions();
 
-    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
+    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
         aMoveTopToPlay = new QAction(this);
         connect(aMoveTopToPlay, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardToPlay);
         aMoveTopToPlayFaceDown = new QAction(this);
@@ -151,8 +149,7 @@ void LibraryMenu::createMoveActions()
         connect(aMoveTopCardsToExileFaceDown, &QAction::triggered, playerActions,
                 &PlayerActions::actMoveTopCardsToExileFaceDown);
         aMoveTopCardsUntil = new QAction(this);
-        connect(aMoveTopCardsUntil, &QAction::triggered, playerActions,
-                &PlayerActions::actRequestMoveTopCardsUntilDialog);
+        connect(aMoveTopCardsUntil, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsUntil);
         aMoveTopCardToBottom = new QAction(this);
         connect(aMoveTopCardToBottom, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardToBottom);
 
@@ -184,16 +181,16 @@ void LibraryMenu::createMoveActions()
 
 void LibraryMenu::createViewActions()
 {
-    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
+    PlayerActions *playerActions = player->getPlayerActions();
 
-    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
+    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
         aViewLibrary = new QAction(this);
         connect(aViewLibrary, &QAction::triggered, playerActions, &PlayerActions::actViewLibrary);
 
         aViewTopCards = new QAction(this);
-        connect(aViewTopCards, &QAction::triggered, playerActions, &PlayerActions::actRequestViewTopCardsDialog);
+        connect(aViewTopCards, &QAction::triggered, playerActions, &PlayerActions::actViewTopCards);
         aViewBottomCards = new QAction(this);
-        connect(aViewBottomCards, &QAction::triggered, playerActions, &PlayerActions::actRequestViewBottomCardsDialog);
+        connect(aViewBottomCards, &QAction::triggered, playerActions, &PlayerActions::actViewBottomCards);
         aAlwaysRevealTopCard = new QAction(this);
         aAlwaysRevealTopCard->setCheckable(true);
         connect(aAlwaysRevealTopCard, &QAction::triggered, playerActions, &PlayerActions::actAlwaysRevealTopCard);
@@ -210,7 +207,7 @@ void LibraryMenu::retranslateUi()
 {
     setTitle(tr("&Library"));
 
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getPlayerInfo()->getLocalOrJudge()) {
         aViewLibrary->setText(tr("&View library"));
         aViewTopCards->setText(tr("View &top cards of library..."));
         aViewBottomCards->setText(tr("View bottom cards of library..."));
@@ -266,11 +263,10 @@ void LibraryMenu::populateRevealLibraryMenuWithActivePlayers()
 
     mRevealLibrary->addSeparator();
 
-    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player->getLogic()) {
+        if (other == player)
             continue;
-        }
         QAction *a = mRevealLibrary->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &LibraryMenu::onRevealLibraryTriggered);
@@ -281,11 +277,10 @@ void LibraryMenu::populateLendLibraryMenuWithActivePlayers()
 {
     mLendLibrary->clear();
 
-    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player->getLogic()) {
+        if (other == player)
             continue;
-        }
         QAction *a = mLendLibrary->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &LibraryMenu::onLendLibraryTriggered);
@@ -302,11 +297,10 @@ void LibraryMenu::populateRevealTopCardMenuWithActivePlayers()
 
     mRevealTopCard->addSeparator();
 
-    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player->getLogic()) {
+        if (other == player)
             continue;
-        }
         QAction *a = mRevealTopCard->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &LibraryMenu::onRevealTopCardTriggered);
@@ -316,33 +310,27 @@ void LibraryMenu::populateRevealTopCardMenuWithActivePlayers()
 void LibraryMenu::onRevealLibraryTriggered()
 {
     if (auto *a = qobject_cast<QAction *>(sender())) {
-        player->getLogic()->getPlayerActions()->actRevealLibrary(a->data().toInt());
+        player->getPlayerActions()->actRevealLibrary(a->data().toInt());
     }
 }
 
 void LibraryMenu::onLendLibraryTriggered()
 {
     if (auto *a = qobject_cast<QAction *>(sender())) {
-        player->getLogic()->getPlayerActions()->actLendLibrary(a->data().toInt());
+        player->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->getLogic()->getDeckZone()->getCards().size();
-        bool ok = true;
-        int number = QInputDialog::getInt(parent, tr("Reveal top cards of library"),
+        int deckSize = player->getDeckZone()->getCards().size();
+        bool ok;
+        int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Reveal top cards of library"),
                                           tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberTopCards, 1,
                                           deckSize, 1, &ok);
-
         if (ok) {
-            player->getLogic()->getPlayerActions()->actRevealTopCards(a->data().toInt(), number);
+            player->getPlayerActions()->actRevealTopCards(a->data().toInt(), number);
             defaultNumberTopCards = number;
         }
     }
diff --git a/cockatrice/src/game_graphics/player/menu/library_menu.h b/cockatrice/src/game/player/menu/library_menu.h
similarity index 88%
rename from cockatrice/src/game_graphics/player/menu/library_menu.h
rename to cockatrice/src/game/player/menu/library_menu.h
index bc0e6fb8e..c0883107c 100644
--- a/cockatrice/src/game_graphics/player/menu/library_menu.h
+++ b/cockatrice/src/game/player/menu/library_menu.h
@@ -1,23 +1,21 @@
 /**
  * @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>
 
-class PlayerGraphicsItem;
-class PlayerLogic;
+class Player;
 class PlayerActions;
 
-class LibraryMenu : public TearOffMenu, public AbstractPlayerComponent
+class LibraryMenu : public TearOffMenu
 {
     Q_OBJECT
 public slots:
@@ -25,20 +23,20 @@ public slots:
     void resetTopCardMenuActions();
 
 public:
-    LibraryMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr);
+    LibraryMenu(Player *player, QWidget *parent = nullptr);
     void createDrawActions();
     void createShuffleActions();
     void createMoveActions();
     void createViewActions();
-    void retranslateUi() override;
+    void retranslateUi();
     void populateRevealLibraryMenuWithActivePlayers();
     void populateLendLibraryMenuWithActivePlayers();
     void populateRevealTopCardMenuWithActivePlayers();
     void onRevealLibraryTriggered();
     void onLendLibraryTriggered();
     void onRevealTopCardTriggered();
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
+    void setShortcutsActive();
+    void setShortcutsInactive();
 
     [[nodiscard]] bool isAlwaysRevealTopCardChecked() const
     {
@@ -112,7 +110,7 @@ public:
     int defaultNumberTopCards = 1;
 
 private:
-    PlayerGraphicsItem *player;
+    Player *player;
 };
 
 #endif // COCKATRICE_LIBRARY_MENU_H
diff --git a/cockatrice/src/game_graphics/player/menu/move_menu.cpp b/cockatrice/src/game/player/menu/move_menu.cpp
similarity index 56%
rename from cockatrice/src/game_graphics/player/menu/move_menu.cpp
rename to cockatrice/src/game/player/menu/move_menu.cpp
index 5b7209a9f..d27e16009 100644
--- a/cockatrice/src/game_graphics/player/menu/move_menu.cpp
+++ b/cockatrice/src/game/player/menu/move_menu.cpp
@@ -1,19 +1,16 @@
 #include "move_menu.h"
 
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../card_menu_action_type.h"
-#include "../player_graphics_item.h"
+#include "../player.h"
+#include "../player_actions.h"
 
-MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to"))
+MoveMenu::MoveMenu(Player *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);
@@ -21,29 +18,18 @@ MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to"))
     aMoveToExile = new QAction(this);
     aMoveToExile->setData(cmMoveToExile);
 
-    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));
+    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);
 
     addAction(aMoveToTopLibrary);
     addAction(aMoveToXfromTopOfLibrary);
     addAction(aMoveToBottomLibrary);
     addSeparator();
-    addAction(aMoveToTable);
-    addSeparator();
     addAction(aMoveToHand);
     addSeparator();
     addAction(aMoveToGraveyard);
@@ -61,7 +47,6 @@ 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"));
@@ -72,8 +57,7 @@ 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_graphics/player/menu/move_menu.h b/cockatrice/src/game/player/menu/move_menu.h
similarity index 78%
rename from cockatrice/src/game_graphics/player/menu/move_menu.h
rename to cockatrice/src/game/player/menu/move_menu.h
index 150bdbd3c..5bf657fa4 100644
--- a/cockatrice/src/game_graphics/player/menu/move_menu.h
+++ b/cockatrice/src/game/player/menu/move_menu.h
@@ -1,20 +1,20 @@
 /**
  * @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>
 
-class PlayerGraphicsItem;
+class Player;
 class MoveMenu : public QMenu
 {
     Q_OBJECT
 
 public:
-    explicit MoveMenu(PlayerGraphicsItem *player);
+    explicit MoveMenu(Player *player);
     void setShortcutsActive();
     void retranslateUi();
 
@@ -23,7 +23,6 @@ public:
     QAction *aMoveToBottomLibrary = nullptr;
 
     QAction *aMoveToHand = nullptr;
-    QAction *aMoveToTable = nullptr;
     QAction *aMoveToGraveyard = nullptr;
     QAction *aMoveToExile = nullptr;
 };
diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp
new file mode 100644
index 000000000..3016a727f
--- /dev/null
+++ b/cockatrice/src/game/player/menu/player_menu.cpp
@@ -0,0 +1,204 @@
+#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
new file mode 100644
index 000000000..882bfedc5
--- /dev/null
+++ b/cockatrice/src/game/player/menu/player_menu.h
@@ -0,0 +1,90 @@
+/**
+ * @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_graphics/player/menu/pt_menu.cpp b/cockatrice/src/game/player/menu/pt_menu.cpp
similarity index 51%
rename from cockatrice/src/game_graphics/player/menu/pt_menu.cpp
rename to cockatrice/src/game/player/menu/pt_menu.cpp
index a01be9424..dae03e07f 100644
--- a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
+++ b/cockatrice/src/game/player/menu/pt_menu.cpp
@@ -1,43 +1,32 @@
 #include "pt_menu.h"
 
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../player_graphics_item.h"
+#include "../player.h"
+#include "../player_actions.h"
 
-PtMenu::PtMenu(PlayerGraphicsItem *player) : QMenu(tr("Power / toughness"))
+PtMenu::PtMenu(Player *player) : QMenu(tr("Power / toughness"))
 {
-    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
+    PlayerActions *playerActions = player->getPlayerActions();
 
     aIncP = new QAction(this);
-    connect(aIncP, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actIncP(player->getGameScene()->selectedCards()); });
+    connect(aIncP, &QAction::triggered, playerActions, &PlayerActions::actIncP);
     aDecP = new QAction(this);
-    connect(aDecP, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actDecP(player->getGameScene()->selectedCards()); });
+    connect(aDecP, &QAction::triggered, playerActions, &PlayerActions::actDecP);
     aIncT = new QAction(this);
-    connect(aIncT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actIncT(player->getGameScene()->selectedCards()); });
+    connect(aIncT, &QAction::triggered, playerActions, &PlayerActions::actIncT);
     aDecT = new QAction(this);
-    connect(aDecT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actDecT(player->getGameScene()->selectedCards()); });
+    connect(aDecT, &QAction::triggered, playerActions, &PlayerActions::actDecT);
     aIncPT = new QAction(this);
-    connect(aIncPT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actIncPT(player->getGameScene()->selectedCards()); });
+    connect(aIncPT, &QAction::triggered, playerActions, [playerActions] { playerActions->actIncPT(); });
     aDecPT = new QAction(this);
-    connect(aDecPT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actDecPT(player->getGameScene()->selectedCards()); });
+    connect(aDecPT, &QAction::triggered, playerActions, &PlayerActions::actDecPT);
     aFlowP = new QAction(this);
-    connect(aFlowP, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actFlowP(player->getGameScene()->selectedCards()); });
+    connect(aFlowP, &QAction::triggered, playerActions, &PlayerActions::actFlowP);
     aFlowT = new QAction(this);
-    connect(aFlowT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actFlowT(player->getGameScene()->selectedCards()); });
+    connect(aFlowT, &QAction::triggered, playerActions, &PlayerActions::actFlowT);
     aSetPT = new QAction(this);
-    connect(aSetPT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actRequestSetPTDialog(player->getGameScene()->selectedCards()); });
+    connect(aSetPT, &QAction::triggered, playerActions, &PlayerActions::actSetPT);
     aResetPT = new QAction(this);
-    connect(aResetPT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actResetPT(player->getGameScene()->selectedCards()); });
+    connect(aResetPT, &QAction::triggered, playerActions, &PlayerActions::actResetPT);
 
     addAction(aIncP);
     addAction(aDecP);
diff --git a/cockatrice/src/game_graphics/player/menu/pt_menu.h b/cockatrice/src/game/player/menu/pt_menu.h
similarity index 84%
rename from cockatrice/src/game_graphics/player/menu/pt_menu.h
rename to cockatrice/src/game/player/menu/pt_menu.h
index 72f828801..44112e54f 100644
--- a/cockatrice/src/game_graphics/player/menu/pt_menu.h
+++ b/cockatrice/src/game/player/menu/pt_menu.h
@@ -1,21 +1,21 @@
 /**
  * @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>
 
-class PlayerGraphicsItem;
+class Player;
 class PtMenu : public QMenu
 {
 
     Q_OBJECT
 
 public:
-    explicit PtMenu(PlayerGraphicsItem *player);
+    explicit PtMenu(Player *player);
     void retranslateUi();
     void setShortcutsActive();
 
diff --git a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp b/cockatrice/src/game/player/menu/rfg_menu.cpp
similarity index 78%
rename from cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
rename to cockatrice/src/game/player/menu/rfg_menu.cpp
index 45abadbf7..8a101c04c 100644
--- a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
+++ b/cockatrice/src/game/player/menu/rfg_menu.cpp
@@ -1,19 +1,18 @@
 #include "rfg_menu.h"
 
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../player_graphics_item.h"
+#include "../player.h"
+#include "../player_actions.h"
 
 #include <libcockatrice/utility/zone_names.h>
 
-RfgMenu::RfgMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
+RfgMenu::RfgMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createMoveActions();
     createViewActions();
 
     addAction(aViewRfg);
 
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getPlayerInfo()->getLocalOrJudge()) {
         addSeparator();
         moveRfgMenu = addTearOffMenu(QString());
         moveRfgMenu->addAction(aMoveRfgToTopLibrary);
@@ -29,8 +28,8 @@ RfgMenu::RfgMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(par
 
 void RfgMenu::createMoveActions()
 {
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
-        auto rfg = player->getLogic()->getRfgZone();
+    if (player->getPlayerInfo()->getLocalOrJudge()) {
+        auto rfg = player->getRfgZone();
 
         aMoveRfgToTopLibrary = new QAction(this);
         aMoveRfgToTopLibrary->setData(QList<QVariant>() << ZoneNames::DECK << 0);
@@ -50,7 +49,7 @@ void RfgMenu::createMoveActions()
 
 void RfgMenu::createViewActions()
 {
-    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
+    PlayerActions *playerActions = player->getPlayerActions();
 
     aViewRfg = new QAction(this);
     connect(aViewRfg, &QAction::triggered, playerActions, &PlayerActions::actViewRfg);
@@ -62,7 +61,7 @@ void RfgMenu::retranslateUi()
 
     aViewRfg->setText(tr("&View exile"));
 
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->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_graphics/player/menu/rfg_menu.h b/cockatrice/src/game/player/menu/rfg_menu.h
similarity index 58%
rename from cockatrice/src/game_graphics/player/menu/rfg_menu.h
rename to cockatrice/src/game/player/menu/rfg_menu.h
index f5dd888e4..0b4623d2a 100644
--- a/cockatrice/src/game_graphics/player/menu/rfg_menu.h
+++ b/cockatrice/src/game/player/menu/rfg_menu.h
@@ -1,33 +1,26 @@
 /**
  * @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>
 
-class PlayerGraphicsItem;
-class RfgMenu : public TearOffMenu, public AbstractPlayerComponent
+class Player;
+class RfgMenu : public TearOffMenu
 {
     Q_OBJECT
 public:
-    explicit RfgMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr);
+    explicit RfgMenu(Player *player, QWidget *parent = nullptr);
     void createMoveActions();
     void createViewActions();
-    void retranslateUi() override;
-    void setShortcutsActive() override
-    {
-    }
-    void setShortcutsInactive() override
-    {
-    }
+    void retranslateUi();
 
     QMenu *moveRfgMenu = nullptr;
 
@@ -38,7 +31,7 @@ public:
     QAction *aMoveRfgToGrave = nullptr;
 
 private:
-    PlayerGraphicsItem *player;
+    Player *player;
 };
 
 #endif // COCKATRICE_RFG_MENU_H
diff --git a/cockatrice/src/game/player/menu/say_menu.cpp b/cockatrice/src/game/player/menu/say_menu.cpp
new file mode 100644
index 000000000..3c4802aa5
--- /dev/null
+++ b/cockatrice/src/game/player/menu/say_menu.cpp
@@ -0,0 +1,28 @@
+#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
new file mode 100644
index 000000000..5dbde2277
--- /dev/null
+++ b/cockatrice/src/game/player/menu/say_menu.h
@@ -0,0 +1,24 @@
+/**
+ * @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_graphics/player/menu/sideboard_menu.cpp b/cockatrice/src/game/player/menu/sideboard_menu.cpp
similarity index 56%
rename from cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
rename to cockatrice/src/game/player/menu/sideboard_menu.cpp
index 0dd7894d2..beaabfcc6 100644
--- a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
+++ b/cockatrice/src/game/player/menu/sideboard_menu.cpp
@@ -1,16 +1,14 @@
 #include "sideboard_menu.h"
 
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../player_graphics_item.h"
+#include "../player.h"
+#include "../player_actions.h"
 
-SideboardMenu::SideboardMenu(PlayerGraphicsItem *player, QMenu *playerMenu) : QMenu(playerMenu)
+SideboardMenu::SideboardMenu(Player *player, QMenu *playerMenu) : QMenu(playerMenu)
 {
     aViewSideboard = new QAction(this);
-    connect(aViewSideboard, &QAction::triggered, player->getLogic()->getPlayerActions(),
-            &PlayerActions::actViewSideboard);
+    connect(aViewSideboard, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actViewSideboard);
 
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getPlayerInfo()->getLocalOrJudge()) {
         addAction(aViewSideboard);
     }
 
diff --git a/cockatrice/src/game/player/menu/sideboard_menu.h b/cockatrice/src/game/player/menu/sideboard_menu.h
new file mode 100644
index 000000000..22d5a2d69
--- /dev/null
+++ b/cockatrice/src/game/player/menu/sideboard_menu.h
@@ -0,0 +1,29 @@
+/**
+ * @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_graphics/player/menu/utility_menu.cpp b/cockatrice/src/game/player/menu/utility_menu.cpp
similarity index 64%
rename from cockatrice/src/game_graphics/player/menu/utility_menu.cpp
rename to cockatrice/src/game/player/menu/utility_menu.cpp
index 61a822b21..37bdcbbaf 100644
--- a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
+++ b/cockatrice/src/game/player/menu/utility_menu.cpp
@@ -1,56 +1,43 @@
 #include "utility_menu.h"
 
 #include "../../../interface/deck_loader/deck_loader.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../player_graphics_item.h"
+#include "../player.h"
+#include "../player_actions.h"
 #include "player_menu.h"
 
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 
-UtilityMenu::UtilityMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
+UtilityMenu::UtilityMenu(Player *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
 {
-    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
-    connect(playerActions, &PlayerActions::requestEnableAndSetCreateAnotherTokenAction, this,
-            &UtilityMenu::setAndEnableCreateAnotherTokenAction);
-    connect(playerActions, &PlayerActions::requestSetLastToken, this, &UtilityMenu::setLastToken);
+    PlayerActions *playerActions = player->getPlayerActions();
 
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getPlayerInfo()->getLocalOrJudge()) {
         aUntapAll = new QAction(this);
         connect(aUntapAll, &QAction::triggered, playerActions, &PlayerActions::actUntapAll);
 
         aRollDie = new QAction(this);
-        connect(aRollDie, &QAction::triggered, playerActions, &PlayerActions::actRequestRollDieDialog);
-
-        aFlipCoin = new QAction(this);
-        connect(aFlipCoin, &QAction::triggered, playerActions, &PlayerActions::actFlipCoin);
+        connect(aRollDie, &QAction::triggered, playerActions, &PlayerActions::actRollDie);
 
         aCreateToken = new QAction(this);
-        connect(aCreateToken, &QAction::triggered, playerActions, [this]() {
-            player->getLogic()->getPlayerActions()->actRequestCreateTokenDialog(getPredefinedTokens());
-        });
+        connect(aCreateToken, &QAction::triggered, playerActions, &PlayerActions::actCreateToken);
 
         aCreateAnotherToken = new QAction(this);
         connect(aCreateAnotherToken, &QAction::triggered, playerActions, &PlayerActions::actCreateAnotherToken);
         aCreateAnotherToken->setEnabled(false);
 
         aIncrementAllCardCounters = new QAction(this);
-        connect(aIncrementAllCardCounters, &QAction::triggered, playerActions, [this]() {
-            player->getLogic()->getPlayerActions()->actIncrementAllCardCounters(
-                player->getGameScene()->selectedCards());
-        });
+        connect(aIncrementAllCardCounters, &QAction::triggered, player, &Player::incrementAllCardCounters);
 
         createPredefinedTokenMenu = new QMenu(QString());
         createPredefinedTokenMenu->setEnabled(false);
-        connect(player->getLogic(), &PlayerLogic::deckChanged, this, &UtilityMenu::populatePredefinedTokensMenu);
+        connect(player, &Player::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);
@@ -63,7 +50,6 @@ UtilityMenu::UtilityMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu
         aIncrementAllCardCounters = nullptr;
         aUntapAll = nullptr;
         aRollDie = nullptr;
-        aFlipCoin = nullptr;
     }
 
     retranslateUi();
@@ -74,7 +60,7 @@ void UtilityMenu::populatePredefinedTokensMenu()
     clear();
     setEnabled(false);
     predefinedTokens.clear();
-    const DeckList &deckList = player->getLogic()->getDeck();
+    const DeckList &deckList = player->getDeck();
 
     if (deckList.isEmpty()) {
         return;
@@ -92,28 +78,17 @@ void UtilityMenu::populatePredefinedTokensMenu()
             if (i < 10) {
                 a->setShortcut(QKeySequence("Alt+" + QString::number((i + 1) % 10)));
             }
-            connect(a, &QAction::triggered, player->getLogic()->getPlayerActions(),
-                    &PlayerActions::actCreatePredefinedToken);
+            connect(a, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actCreatePredefinedToken);
         }
     }
 }
 
-void UtilityMenu::setLastToken(CardInfoPtr lastToken)
-{
-    if (!createAnotherTokenActionExists()) {
-        return;
-    }
-
-    player->getLogic()->getPlayerActions()->setLastTokenInfo(lastToken);
-}
-
 void UtilityMenu::retranslateUi()
 {
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->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"));
@@ -124,11 +99,10 @@ void UtilityMenu::setShortcutsActive()
 {
     ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
 
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->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"));
     }
@@ -136,10 +110,9 @@ void UtilityMenu::setShortcutsActive()
 
 void UtilityMenu::setShortcutsInactive()
 {
-    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->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_graphics/player/menu/utility_menu.h b/cockatrice/src/game/player/menu/utility_menu.h
similarity index 56%
rename from cockatrice/src/game_graphics/player/menu/utility_menu.h
rename to cockatrice/src/game/player/menu/utility_menu.h
index bdc2a81a5..ff57e7252 100644
--- a/cockatrice/src/game_graphics/player/menu/utility_menu.h
+++ b/cockatrice/src/game/player/menu/utility_menu.h
@@ -1,30 +1,26 @@
 /**
  * @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 "abstract_player_component.h"
-
 #include <QMenu>
-#include <libcockatrice/card/card_info.h>
 
-class PlayerGraphicsItem;
-class UtilityMenu : public QMenu, public AbstractPlayerComponent
+class Player;
+class UtilityMenu : public QMenu
 {
     Q_OBJECT
 public slots:
     void populatePredefinedTokensMenu();
-    void setLastToken(CardInfoPtr lastToken);
-    void retranslateUi() override;
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
+    void retranslateUi();
+    void setShortcutsActive();
+    void setShortcutsInactive();
 
 public:
-    explicit UtilityMenu(PlayerGraphicsItem *player, QMenu *playerMenu);
+    explicit UtilityMenu(Player *player, QMenu *playerMenu);
 
     [[nodiscard]] bool createAnotherTokenActionExists() const
     {
@@ -33,7 +29,7 @@ public:
 
     void setAndEnableCreateAnotherTokenAction(QString text)
     {
-        aCreateAnotherToken->setText(tr("C&reate another %1 token").arg(text));
+        aCreateAnotherToken->setText(text);
         aCreateAnotherToken->setEnabled(true);
     }
 
@@ -43,13 +39,13 @@ public:
     }
 
 private:
-    PlayerGraphicsItem *player;
+    Player *player;
     QStringList predefinedTokens;
 
     QMenu *createPredefinedTokenMenu;
 
     QAction *aIncrementAllCardCounters;
-    QAction *aUntapAll, *aRollDie, *aFlipCoin;
+    QAction *aUntapAll, *aRollDie;
     QAction *aCreateToken, *aCreateAnotherToken;
 };
 
diff --git a/cockatrice/src/game/player/player_logic.cpp b/cockatrice/src/game/player/player.cpp
similarity index 53%
rename from cockatrice/src/game/player/player_logic.cpp
rename to cockatrice/src/game/player/player.cpp
index 485e2fc5c..ac4149f0e 100644
--- a/cockatrice/src/game/player/player_logic.cpp
+++ b/cockatrice/src/game/player/player.cpp
@@ -1,18 +1,18 @@
-#include "player_logic.h"
+#include "player.h"
 
-#include "../../game_graphics/board/arrow_item.h"
-#include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/board/counter_general.h"
-#include "../../game_graphics/game_scene.h"
-#include "../../game_graphics/player/player_target.h"
-#include "../../game_graphics/zones/hand_zone.h"
-#include "../../game_graphics/zones/pile_zone.h"
-#include "../../game_graphics/zones/stack_zone.h"
-#include "../../game_graphics/zones/table_zone.h"
 #include "../../interface/theme_manager.h"
 #include "../../interface/widgets/tabs/tab_game.h"
+#include "../board/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>
@@ -29,15 +29,37 @@
 #include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
 #include <libcockatrice/utility/color.h>
 
-PlayerLogic::PlayerLogic(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent)
+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), 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();
 }
 
-void PlayerLogic::initializeZones()
+// 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, ZoneNames::DECK, false, true, false, this));
     addZone(new PileZoneLogic(this, ZoneNames::GRAVE, false, false, true, this));
@@ -50,22 +72,22 @@ void PlayerLogic::initializeZones()
     addZone(new HandZoneLogic(this, ZoneNames::HAND, false, false, visibleHand, this));
 }
 
-PlayerLogic::~PlayerLogic()
+Player::~Player()
 {
     qCInfo(PlayerLog) << "Player destructor:" << getPlayerInfo()->getName();
 
     QMapIterator<QString, CardZoneLogic *> i(zones);
-    while (i.hasNext()) {
+    while (i.hasNext())
         delete i.next().value();
-    }
     zones.clear();
 
+    delete playerMenu;
     delete getPlayerInfo()->userInfo;
 }
 
-void PlayerLogic::clear()
+void Player::clear()
 {
-    emit arrowsClearedLocally();
+    clearArrows();
 
     QMapIterator<QString, CardZoneLogic *> i(zones);
     while (i.hasNext()) {
@@ -75,11 +97,12 @@ void PlayerLogic::clear()
     clearCounters();
 }
 
-void PlayerLogic::setConceded(bool _conceded)
+void Player::setConceded(bool _conceded)
 {
     if (conceded != _conceded) {
         conceded = _conceded;
 
+        getGraphicsItem()->setVisible(!conceded);
         if (conceded) {
             clear();
         }
@@ -87,15 +110,13 @@ void PlayerLogic::setConceded(bool _conceded)
     }
 }
 
-void PlayerLogic::setZoneId(int _zoneId)
+void Player::setZoneId(int _zoneId)
 {
-    if (zoneId != _zoneId) {
-        zoneId = _zoneId;
-        emit zoneIdChanged(zoneId);
-    }
+    zoneId = _zoneId;
+    graphicsItem->getPlayerArea()->setPlayerZoneId(zoneId);
 }
 
-void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info)
+void Player::processPlayerInfo(const ServerInfo_Player &info)
 {
     static QSet<QString> builtinZones{/* PileZones */
                                       ZoneNames::DECK, ZoneNames::GRAVE, ZoneNames::EXILE, ZoneNames::SIDEBOARD,
@@ -106,7 +127,7 @@ void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info)
                                       /* HandZone */
                                       ZoneNames::HAND};
     clearCounters();
-    emit arrowsClearedLocally();
+    clearArrows();
 
     QMutableMapIterator<QString, CardZoneLogic *> zoneIt(zones);
     while (zoneIt.hasNext()) {
@@ -193,7 +214,7 @@ void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info)
     setConceded(info.properties().conceded());
 }
 
-void PlayerLogic::processCardAttachment(const ServerInfo_Player &info)
+void Player::processCardAttachment(const ServerInfo_Player &info)
 {
     const int zoneListSize = info.zone_list_size();
     for (int i = 0; i < zoneListSize; ++i) {
@@ -222,17 +243,16 @@ void PlayerLogic::processCardAttachment(const ServerInfo_Player &info)
 
     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())));
+        addArrow(info.arrow_list(i));
     }
 }
 
-void PlayerLogic::addCard(CardItem *card)
+void Player::addCard(CardItem *card)
 {
     emit newCardAdded(card);
 }
 
-void PlayerLogic::deleteCard(CardItem *card)
+void Player::deleteCard(CardItem *card)
 {
     if (card == nullptr) {
         return;
@@ -243,60 +263,179 @@ void PlayerLogic::deleteCard(CardItem *card)
     }
 }
 
-void PlayerLogic::setDeck(const DeckList &_deck)
+void Player::setDeck(const DeckList &_deck)
 {
     deck = _deck;
 
     emit deckChanged();
 }
 
-CounterState *PlayerLogic::addCounter(const ServerInfo_Counter &counter)
+AbstractCounter *Player::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)
+AbstractCounter *Player::addCounter(int counterId, const QString &name, QColor color, int radius, int value)
 {
-    if (counters.contains(id)) {
+    if (counters.contains(counterId)) {
         return nullptr;
     }
-    auto *state = new CounterState(id, name, color, radius, value, this);
-    counters.insert(id, state);
-    emit counterAdded(state);
-    return state;
+
+    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 PlayerLogic::delCounter(int id)
+void Player::delCounter(int counterId)
 {
-    auto *state = counters.take(id);
-    if (!state) {
+    AbstractCounter *ctr = counters.value(counterId, 0);
+    if (!ctr) {
         return;
     }
-    emit counterRemoved(id);
-    state->deleteLater();
+
+    ctr->delCounter();
+    counters.remove(counterId);
+    emit rearrangeCounters();
 }
 
-void PlayerLogic::clearCounters()
+void Player::clearCounters()
 {
-    for (int id : counters.keys()) {
-        emit counterRemoved(id);
+    QMapIterator<int, AbstractCounter *> counterIterator(counters);
+    while (counterIterator.hasNext()) {
+        counterIterator.next().value()->delCounter();
     }
-    qDeleteAll(counters);
     counters.clear();
 }
 
-CounterState *PlayerLogic::getLifeCounter() const
+void Player::incrementAllCardCounters()
 {
-    for (auto *s : counters.values()) {
-        if (s->getName() == "life") {
-            return s;
+    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());
         }
     }
-    return nullptr;
+
+    if (!commandList.isEmpty()) {
+        playerActions->sendGameCommand(playerActions->prepareGameCommand(commandList));
+    }
 }
 
-bool PlayerLogic::clearCardsToDelete()
+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;
@@ -312,22 +451,28 @@ bool PlayerLogic::clearCardsToDelete()
     return true;
 }
 
-void PlayerLogic::setActive(bool _active)
+void Player::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()
+void Player::updateZones()
 {
     getTableZone()->reorganizeCards();
 }
 
-void PlayerLogic::setGameStarted()
+PlayerGraphicsItem *Player::getGraphicsItem()
+{
+    return graphicsItem;
+}
+
+GameScene *Player::getGameScene()
+{
+    return getGraphicsItem()->getGameScene();
+}
+
+void Player::setGameStarted()
 {
     if (playerInfo->local) {
         emit resetTopCardMenuActions();
diff --git a/cockatrice/src/game/player/player_logic.h b/cockatrice/src/game/player/player.h
similarity index 72%
rename from cockatrice/src/game/player/player_logic.h
rename to cockatrice/src/game/player/player.h
index a89cb6eed..e9c008821 100644
--- a/cockatrice/src/game/player/player_logic.h
+++ b/cockatrice/src/game/player/player.h
@@ -1,21 +1,23 @@
 /**
  * @file player.h
  * @ingroup GameLogicPlayers
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "../../game_graphics/player/player_area.h"
+#include "../../game_graphics/board/abstract_graphics_item.h"
 #include "../../interface/widgets/menus/tearoff_menu.h"
-#include "../board/arrow_data.h"
 #include "../interface/deck_loader/loaded_deck.h"
-#include "../zones/hand_zone_logic.h"
-#include "../zones/pile_zone_logic.h"
-#include "../zones/stack_zone_logic.h"
-#include "../zones/table_zone_logic.h"
+#include "../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>
@@ -37,6 +39,7 @@ class Message;
 }
 } // namespace google
 class AbstractCardItem;
+class AbstractCounter;
 class AbstractGame;
 class ArrowItem;
 class ArrowTarget;
@@ -52,7 +55,6 @@ class PlayerMenu;
 class QAction;
 class QMenu;
 class ServerInfo_Arrow;
-class ServerInfo_Card;
 class ServerInfo_Counter;
 class ServerInfo_Player;
 class ServerInfo_User;
@@ -60,41 +62,28 @@ class TabGame;
 
 const int MAX_TOKENS_PER_DIALOG = 99;
 
-class PlayerLogic : public QObject
+class Player : 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();
     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;
+    Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent);
+    void forwardActionSignalsToEventHandler();
+    ~Player() override;
 
     void initializeZones();
     void updateZones();
@@ -118,6 +107,10 @@ public:
         return game;
     }
 
+    GameScene *getGameScene();
+
+    [[nodiscard]] PlayerGraphicsItem *getGraphicsItem();
+
     [[nodiscard]] PlayerActions *getPlayerActions() const
     {
         return playerActions;
@@ -133,6 +126,11 @@ public:
         return playerInfo;
     }
 
+    [[nodiscard]] PlayerMenu *getPlayerMenu() const
+    {
+        return playerMenu;
+    }
+
     void setDeck(const DeckList &_deck);
 
     [[nodiscard]] const DeckList &getDeck() const
@@ -191,20 +189,27 @@ public:
         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);
+    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, CounterState *> getCounters() const
+    QMap<int, AbstractCounter *> getCounters()
     {
         return counters;
     }
 
-    /**
-     * Gets the counter that represents the life total.
-     */
-    CounterState *getLifeCounter() const;
+    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
@@ -231,6 +236,8 @@ private:
     PlayerInfo *playerInfo;
     PlayerEventHandler *playerEventHandler;
     PlayerActions *playerActions;
+    PlayerMenu *playerMenu;
+    PlayerGraphicsItem *graphicsItem;
 
     bool active;
     bool conceded;
@@ -239,10 +246,13 @@ private:
 
     int zoneId;
     QMap<QString, CardZoneLogic *> zones;
-    QMap<int, CounterState *> counters;
+    QMap<int, AbstractCounter *> counters;
+    QMap<int, ArrowItem *> arrows;
 
     bool dialogSemaphore;
     QList<CardItem *> cardsToDelete;
+
+    // void eventConnectionStateChanged(const Event_ConnectionStateChanged &event);
 };
 
 class AnnotationDialog : public QInputDialog
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index de909ca5e..20e526727 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -1,13 +1,14 @@
 #include "player_actions.h"
 
-#include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
-#include "../../game_graphics/dialogs/dlg_roll_dice.h"
-#include "../../game_graphics/player/card_menu_action_type.h"
-#include "../../game_graphics/zones/hand_zone.h"
-#include "../../game_graphics/zones/table_zone.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../../interface/widgets/utility/get_text_with_max.h"
-#include "../zones/view_zone_logic.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 <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
@@ -17,7 +18,6 @@
 #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>
@@ -27,18 +27,14 @@
 #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/expression.h>
 #include <libcockatrice/utility/trice_limits.h>
 #include <libcockatrice/utility/zone_names.h>
 
 // milliseconds in between triggers of the move top cards until action
 static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100;
 
-PlayerActions::PlayerActions(PlayerLogic *_player)
-    : QObject(_player), player(_player), lastTokenTableRow(0), movingCardsUntil(false)
+PlayerActions::PlayerActions(Player *_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);
@@ -68,7 +64,7 @@ void PlayerActions::playCard(CardItem *card, bool faceDown)
     int tableRow = info.getUiAttributes().tableRow;
     bool playToStack = SettingsCache::instance().getPlayToStack();
     QString currentZone = card->getZone()->getName();
-    if (!faceDown && currentZone == ZoneNames::STACK && tableRow == 3) {
+    if (currentZone == ZoneNames::STACK && tableRow == 3) {
         cmd.set_target_zone(ZoneNames::GRAVE);
         cmd.set_x(0);
         cmd.set_y(0);
@@ -79,15 +75,14 @@ void PlayerActions::playCard(CardItem *card, bool faceDown)
         cmd.set_y(0);
     } else {
         tableRow = faceDown ? 2 : info.getUiAttributes().tableRow;
-        QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(tableRow));
+        QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow));
         cardToMove->set_face_down(faceDown);
         if (!faceDown) {
             cardToMove->set_pt(info.getPowTough().toStdString());
         }
         cardToMove->set_tapped(!faceDown && info.getUiAttributes().cipt);
-        if (tableRow != 3) {
+        if (tableRow != 3)
             cmd.set_target_zone(ZoneNames::TABLE);
-        }
         cmd.set_x(gridPoint.x());
         cmd.set_y(gridPoint.y());
     }
@@ -119,7 +114,12 @@ void PlayerActions::playCardToTable(const CardItem *card, bool faceDown)
     const CardInfo &info = exactCard.getInfo();
 
     int tableRow = faceDown ? 2 : info.getUiAttributes().tableRow;
-    QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(tableRow));
+    // default instant/sorcery cards to the noncreatures row
+    if (tableRow > 2) {
+        tableRow = 1;
+    }
+
+    QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow));
     cardToMove->set_face_down(faceDown);
     if (!faceDown) {
         cardToMove->set_pt(info.getPowTough().toStdString());
@@ -133,12 +133,12 @@ void PlayerActions::playCardToTable(const CardItem *card, bool faceDown)
 
 void PlayerActions::actViewLibrary()
 {
-    emit requestZoneViewToggle(ZoneNames::DECK, -1);
+    player->getGameScene()->toggleZoneView(player, ZoneNames::DECK, -1);
 }
 
 void PlayerActions::actViewHand()
 {
-    emit requestZoneViewToggle(ZoneNames::HAND, -1);
+    player->getGameScene()->toggleZoneView(player, ZoneNames::HAND, -1);
 }
 
 /**
@@ -170,45 +170,49 @@ void PlayerActions::actSortHand()
 
     static QList defaultOptions = {CardList::SortByName, CardList::SortByPrinting};
 
-    emit requestSortHand(sortOptions + defaultOptions);
+    player->getGraphicsItem()->getHandZoneGraphicsItem()->sortHand(sortOptions + defaultOptions);
 }
 
-void PlayerActions::actRequestViewTopCardsDialog()
+void PlayerActions::actViewTopCards()
 {
-    emit requestViewTopCardsDialog(defaultNumberTopCards, player->getDeckZone()->getCards().size());
+    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, ZoneNames::DECK, number);
+    }
 }
 
-void PlayerActions::actViewTopCards(int number)
+void PlayerActions::actViewBottomCards()
 {
-    defaultNumberTopCards = number;
-    emit requestZoneViewToggle(ZoneNames::DECK, 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, ZoneNames::DECK, number, true);
+    }
 }
 
-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)
+void PlayerActions::actAlwaysRevealTopCard()
 {
     Command_ChangeZoneProperties cmd;
     cmd.set_zone_name(ZoneNames::DECK);
-    cmd.set_always_reveal_top_card(alwaysRevealTopCard);
+    cmd.set_always_reveal_top_card(player->getPlayerMenu()->getLibraryMenu()->isAlwaysRevealTopCardChecked());
 
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actAlwaysLookAtTopCard(bool alwaysRevealTopCard)
+void PlayerActions::actAlwaysLookAtTopCard()
 {
     Command_ChangeZoneProperties cmd;
     cmd.set_zone_name(ZoneNames::DECK);
-    cmd.set_always_look_at_top_card(alwaysRevealTopCard);
+    cmd.set_always_look_at_top_card(player->getPlayerMenu()->getLibraryMenu()->isAlwaysLookAtTopCardChecked());
 
     sendGameCommand(cmd);
 }
@@ -220,17 +224,17 @@ void PlayerActions::actOpenDeckInDeckEditor()
 
 void PlayerActions::actViewGraveyard()
 {
-    emit requestZoneViewToggle(ZoneNames::GRAVE, -1);
+    player->getGameScene()->toggleZoneView(player, ZoneNames::GRAVE, -1);
 }
 
 void PlayerActions::actViewRfg()
 {
-    emit requestZoneViewToggle(ZoneNames::EXILE, -1);
+    player->getGameScene()->toggleZoneView(player, ZoneNames::EXILE, -1);
 }
 
 void PlayerActions::actViewSideboard()
 {
-    emit requestZoneViewToggle(ZoneNames::SIDEBOARD, -1);
+    player->getGameScene()->toggleZoneView(player, ZoneNames::SIDEBOARD, -1);
 }
 
 void PlayerActions::actShuffle()
@@ -238,20 +242,18 @@ void PlayerActions::actShuffle()
     sendGameCommand(Command_Shuffle());
 }
 
-void PlayerActions::actRequestShuffleTopDialog()
+void PlayerActions::actShuffleTop()
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
         return;
     }
 
-    emit requestShuffleTopDialog(defaultNumberTopCards, maxCards);
-}
-
-void PlayerActions::actShuffleTop(int number)
-{
-    const int maxCards = player->getDeckZone()->getCards().size();
-    if (maxCards == 0) {
+    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) {
         return;
     }
 
@@ -269,20 +271,18 @@ void PlayerActions::actShuffleTop(int number)
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actRequestShuffleBottomDialog()
+void PlayerActions::actShuffleBottom()
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
         return;
     }
 
-    emit requestShuffleBottomDialog(defaultNumberBottomCards, maxCards);
-}
-
-void PlayerActions::actShuffleBottom(int number)
-{
-    const int maxCards = player->getDeckZone()->getCards().size();
-    if (maxCards == 0) {
+    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) {
         return;
     }
 
@@ -307,18 +307,21 @@ void PlayerActions::actDrawCard()
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actRequestMulliganDialog()
+void PlayerActions::actMulligan()
 {
     int startSize = SettingsCache::instance().getStartingHandSize();
     int handSize = player->getHandZone()->getCards().size();
     int deckSize = player->getDeckZone()->getCards().size() + handSize;
 
-    emit requestMulliganDialog(startSize, handSize, deckSize);
-}
+    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);
 
-void PlayerActions::actMulligan(int number)
-{
-    int handSize = player->getHandZone()->getCards().size();
+    if (!ok) {
+        return;
+    }
 
     if (number < 1) {
         number = handSize + number;
@@ -352,19 +355,19 @@ void PlayerActions::doMulligan(int number)
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actRequestDrawCardsDialog()
+void PlayerActions::actDrawCards()
 {
     int deckSize = player->getDeckZone()->getCards().size();
-
-    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);
+    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);
+    }
 }
 
 void PlayerActions::actUndoDraw()
@@ -422,40 +425,36 @@ void PlayerActions::actMoveTopCardToExile()
 
 void PlayerActions::actMoveTopCardsToGrave()
 {
-    actRequestMoveTopCardsToDialog(ZoneNames::GRAVE, tr("grave"), false);
+    moveTopCardsTo(ZoneNames::GRAVE, tr("grave"), false);
 }
 
 void PlayerActions::actMoveTopCardsToGraveFaceDown()
 {
-    actRequestMoveTopCardsToDialog(ZoneNames::GRAVE, tr("grave"), true);
+    moveTopCardsTo(ZoneNames::GRAVE, tr("grave"), true);
 }
 
 void PlayerActions::actMoveTopCardsToExile()
 {
-    actRequestMoveTopCardsToDialog(ZoneNames::EXILE, tr("exile"), false);
+    moveTopCardsTo(ZoneNames::EXILE, tr("exile"), false);
 }
 
 void PlayerActions::actMoveTopCardsToExileFaceDown()
 {
-    actRequestMoveTopCardsToDialog(ZoneNames::EXILE, tr("exile"), true);
+    moveTopCardsTo(ZoneNames::EXILE, tr("exile"), true);
 }
 
-void PlayerActions::actRequestMoveTopCardsToDialog(const QString &targetZone,
-                                                   const QString &zoneDisplayName,
-                                                   bool faceDown)
+void PlayerActions::moveTopCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown)
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
         return;
     }
 
-    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) {
+    bool ok;
+    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move top cards to %1").arg(zoneDisplayName),
+                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1,
+                                      maxCards, 1, &ok);
+    if (!ok) {
         return;
     }
 
@@ -482,22 +481,26 @@ void PlayerActions::moveTopCardsTo(int number, const QString &targetZone, bool f
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actRequestMoveTopCardsUntilDialog()
+void PlayerActions::actMoveTopCardsUntil()
 {
     stopMoveTopCardsUntil();
 
-    emit requestMoveTopCardsUntilDialog(movingCardsUntilOptions);
-}
+    DlgMoveTopCardsUntil dlg(player->getGame()->getTab(), movingCardsUntilExprs, movingCardsUntilNumberOfHits,
+                             movingCardsUntilAutoPlay);
+    if (!dlg.exec()) {
+        return;
+    }
 
-void PlayerActions::moveTopCardsUntil(const QString &expr, MoveTopCardsUntilOptions options)
-{
-    movingCardsUntilOptions = options;
+    auto expr = dlg.getExpr();
+    movingCardsUntilExprs = dlg.getExprs();
+    movingCardsUntilNumberOfHits = dlg.getNumberOfHits();
+    movingCardsUntilAutoPlay = dlg.isAutoPlay();
 
     if (player->getDeckZone()->getCards().empty()) {
         stopMoveTopCardsUntil();
     } else {
         movingCardsUntilFilter = FilterString(expr);
-        movingCardsUntilCounter = movingCardsUntilOptions.numberOfHits;
+        movingCardsUntilCounter = movingCardsUntilNumberOfHits;
         movingCardsUntil = true;
         actMoveTopCardToPlay();
     }
@@ -509,7 +512,7 @@ void PlayerActions::moveOneCardUntil(CardItem *card)
 
     const bool isMatch = card && movingCardsUntilFilter.check(card->getCard().getCardPtr());
 
-    if (isMatch && movingCardsUntilOptions.autoPlay) {
+    if (isMatch && movingCardsUntilAutoPlay) {
         // 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); });
@@ -620,40 +623,36 @@ void PlayerActions::actMoveBottomCardToExile()
 
 void PlayerActions::actMoveBottomCardsToGrave()
 {
-    actRequestMoveBottomCardsToDialog(ZoneNames::GRAVE, tr("grave"), false);
+    moveBottomCardsTo(ZoneNames::GRAVE, tr("grave"), false);
 }
 
 void PlayerActions::actMoveBottomCardsToGraveFaceDown()
 {
-    actRequestMoveBottomCardsToDialog(ZoneNames::GRAVE, tr("grave"), true);
+    moveBottomCardsTo(ZoneNames::GRAVE, tr("grave"), true);
 }
 
 void PlayerActions::actMoveBottomCardsToExile()
 {
-    actRequestMoveBottomCardsToDialog(ZoneNames::EXILE, tr("exile"), false);
+    moveBottomCardsTo(ZoneNames::EXILE, tr("exile"), false);
 }
 
 void PlayerActions::actMoveBottomCardsToExileFaceDown()
 {
-    actRequestMoveBottomCardsToDialog(ZoneNames::EXILE, tr("exile"), true);
+    moveBottomCardsTo(ZoneNames::EXILE, tr("exile"), true);
 }
 
-void PlayerActions::actRequestMoveBottomCardsToDialog(const QString &targetZone,
-                                                      const QString &zoneDisplayName,
-                                                      bool faceDown)
+void PlayerActions::moveBottomCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown)
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
         return;
     }
 
-    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) {
+    bool ok;
+    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move bottom cards to %1").arg(zoneDisplayName),
+                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1,
+                                      maxCards, 1, &ok);
+    if (!ok) {
         return;
     }
 
@@ -765,24 +764,20 @@ void PlayerActions::actDrawBottomCard()
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actRequestDrawBottomCardsDialog()
+void PlayerActions::actDrawBottomCards()
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
         return;
     }
 
-    emit requestDrawBottomCardsDialog(defaultNumberBottomCards, maxCards);
-}
-
-void PlayerActions::actDrawBottomCards(int number)
-{
-    const int maxCards = player->getDeckZone()->getCards().size();
-    if (maxCards == 0) {
+    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) {
         return;
-    }
-
-    if (number > maxCards) {
+    } else if (number > maxCards) {
         number = maxCards;
     }
     defaultNumberBottomCards = number;
@@ -849,46 +844,39 @@ void PlayerActions::actUntapAll()
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actRequestRollDieDialog()
+void PlayerActions::actRollDie()
 {
-    emit requestRollDieDialog();
-}
+    DlgRollDice dlg(player->getGame()->getTab());
+    if (!dlg.exec()) {
+        return;
+    }
 
-void PlayerActions::actRollDie(int sides, int count)
-{
     Command_RollDie cmd;
-    cmd.set_sides(sides);
-    cmd.set_count(count);
+    cmd.set_sides(dlg.getDieSideCount());
+    cmd.set_count(dlg.getDiceToRollCount());
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actFlipCoin()
+void PlayerActions::actCreateToken()
 {
-    Command_RollDie cmd;
-    cmd.set_sides(2);
-    cmd.set_count(1);
-    sendGameCommand(cmd);
-}
+    DlgCreateToken dlg(player->getPlayerMenu()->getUtilityMenu()->getPredefinedTokens(), player->getGame()->getTab());
+    if (!dlg.exec()) {
+        return;
+    }
 
-void PlayerActions::actRequestCreateTokenDialog(const QStringList &predefinedTokens)
-{
-    emit requestCreateTokenDialog(predefinedTokens);
-}
-
-void PlayerActions::actCreateToken(TokenInfo tokenToCreate)
-{
-    lastTokenInfo = tokenToCreate;
+    lastTokenInfo = dlg.getTokenInfo();
 
     ExactCard correctedCard = CardDatabaseManager::query()->guessCard({lastTokenInfo.name, lastTokenInfo.providerId});
     if (correctedCard) {
         lastTokenInfo.name = correctedCard.getName();
-        lastTokenTableRow = TableZone::tableRowToGridY(correctedCard.getInfo().getUiAttributes().tableRow);
+        lastTokenTableRow = TableZone::clampValidTableRow(2 - correctedCard.getInfo().getUiAttributes().tableRow);
         if (lastTokenInfo.pt.isEmpty()) {
             lastTokenInfo.pt = correctedCard.getInfo().getPowTough();
         }
     }
 
-    emit requestEnableAndSetCreateAnotherTokenAction(lastTokenInfo.name);
+    player->getPlayerMenu()->getUtilityMenu()->setAndEnableCreateAnotherTokenAction(
+        tr("C&reate another %1 token").arg(lastTokenInfo.name));
     actCreateAnotherToken();
 }
 
@@ -919,12 +907,8 @@ void PlayerActions::setLastToken(CardInfoPtr cardInfo)
         return;
     }
 
-    emit requestSetLastToken(cardInfo);
-}
-
-void PlayerActions::setLastTokenInfo(CardInfoPtr cardInfo)
-{
-    if (cardInfo == nullptr) {
+    UtilityMenu *utilityMenu = player->getPlayerMenu()->getUtilityMenu();
+    if (utilityMenu == nullptr || !utilityMenu->createAnotherTokenActionExists()) {
         return;
     }
 
@@ -936,9 +920,9 @@ void PlayerActions::setLastTokenInfo(CardInfoPtr cardInfo)
                      .providerId =
                          SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName())};
 
-    lastTokenTableRow = TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow);
+    lastTokenTableRow = TableZone::clampValidTableRow(2 - cardInfo->getUiAttributes().tableRow);
 
-    emit requestEnableAndSetCreateAnotherTokenAction(lastTokenInfo.name);
+    utilityMenu->setAndEnableCreateAnotherTokenAction(tr("C&reate another %1 token").arg(lastTokenInfo.name));
 }
 
 void PlayerActions::actCreatePredefinedToken()
@@ -957,17 +941,23 @@ 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());
-    actRequestCreateRelatedFromRelationDialog(sourceCard, cardRelation);
+
+    /*
+     * 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());
+    }
 }
 
 void PlayerActions::actCreateAllRelatedCards()
@@ -987,9 +977,7 @@ void PlayerActions::actCreateAllRelatedCards()
 
     if (relatedCards.length() == 1) {
         cardRelation = relatedCards.at(0);
-        lastRelatedCreationSucceeded = false; // reset before emit
-        actRequestCreateRelatedFromRelationDialog(sourceCard, cardRelation);
-        if (lastRelatedCreationSucceeded) {
+        if (createRelatedFromRelation(sourceCard, cardRelation)) {
             ++tokensTypesCreated;
         }
     } else {
@@ -1001,18 +989,15 @@ void PlayerActions::actCreateAllRelatedCards()
             }
         }
         switch (nonExcludedRelatedCards.length()) {
-            case 1:
+            case 1: // if nonExcludedRelatedCards == 1
                 cardRelation = nonExcludedRelatedCards.at(0);
-                lastRelatedCreationSucceeded = false; // reset before emit
-                actRequestCreateRelatedFromRelationDialog(sourceCard, cardRelation);
-                if (lastRelatedCreationSucceeded) {
+                if (createRelatedFromRelation(sourceCard, cardRelation)) {
                     ++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:
+            case 0: // else if nonExcludedRelatedCards == 0
                 for (CardRelation *cardRelationAll : relatedCards) {
                     if (!cardRelationAll->getDoesAttach() && !cardRelationAll->getIsVariable()) {
                         dbName = cardRelationAll->getName();
@@ -1027,8 +1012,7 @@ void PlayerActions::actCreateAllRelatedCards()
                     }
                 }
                 break;
-
-            default:
+            default: // else
                 for (CardRelation *cardRelationNotExcluded : nonExcludedRelatedCards) {
                     if (!cardRelationNotExcluded->getDoesAttach() && !cardRelationNotExcluded->getIsVariable()) {
                         dbName = cardRelationNotExcluded->getName();
@@ -1056,83 +1040,43 @@ void PlayerActions::actCreateAllRelatedCards()
     }
 }
 
-void PlayerActions::actRequestCreateRelatedFromRelationDialog(const CardItem *sourceCard,
-                                                              const CardRelation *cardRelation)
-{
-    emit requestCreateRelatedFromRelationDialog(sourceCard, cardRelation);
-}
-
-bool PlayerActions::createRelatedFromRelation(const CardItem *sourceCard,
-                                              const CardRelation *cardRelation,
-                                              int variableCount)
+bool PlayerActions::createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation)
 {
     if (sourceCard == nullptr || cardRelation == nullptr) {
         return false;
     }
-
-    const QString dbName = cardRelation->getName();
-    const bool persistent = cardRelation->getIsPersistent();
-
-    // Variable relations always use DoesNotAttach, regardless of the count the user
-    // entered.
+    QString dbName = cardRelation->getName();
+    bool persistent = cardRelation->getIsPersistent();
     if (cardRelation->getIsVariable()) {
-        if (variableCount <= 0) {
+        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) {
             return false;
         }
-        for (int i = 0; i < variableCount; ++i) {
-            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent);
-        }
-        return true;
-    }
-
-    const int count = cardRelation->getDefaultCount();
-
-    if (count > 1) {
         for (int i = 0; i < count; ++i) {
             createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent);
         }
-        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 if (cardRelation->getDefaultCount() > 1) {
+        for (int i = 0; i < cardRelation->getDefaultCount(); ++i) {
+            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent);
+        }
     } else {
-        attachType = CardRelationType::DoesNotAttach;
-    }
+        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() != ZoneNames::TABLE) {
-        playCardToTable(sourceCard, false);
-    }
+        // 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);
+        createCard(sourceCard, dbName, attachType, persistent);
+    }
     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,
@@ -1144,7 +1088,9 @@ void PlayerActions::createCard(const CardItem *sourceCard,
         return;
     }
 
-    QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow));
+    // 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));
 
     // create the token for the related card
     Command_CreateToken cmd;
@@ -1210,29 +1156,95 @@ void PlayerActions::actSayMessage()
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actRequestMoveCardXCardsFromTopDialog()
+void PlayerActions::setCardAttrHelper(const GameEventContext &context,
+                                      CardItem *card,
+                                      CardAttribute attribute,
+                                      const QString &avalue,
+                                      bool allCards,
+                                      EventProcessingOptions options)
 {
-    int deckSize = player->getDeckZone()->getCards().size() + 1; // add the card to move to the deck
+    if (card == nullptr) {
+        return;
+    }
 
-    emit requestMoveCardXCardsFromTopDialog(defaultNumberTopCardsToPlaceBelow, deckSize);
+    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(QList<CardItem *> selectedCards, int number)
+void PlayerActions::actMoveCardXCardsFromTop()
 {
+    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;
+    }
+
     defaultNumberTopCardsToPlaceBelow = number;
 
-    if (selectedCards.isEmpty()) {
+    QList<QGraphicsItem *> sel = player->getGameScene()->selectedItems();
+    if (sel.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 : selectedCards) {
+    for (const auto &i : cardList) {
         idList.add_card()->set_card_id(i->getId());
     }
 
-    int startPlayerId = selectedCards[0]->getZone()->getPlayer()->getPlayerInfo()->getId();
-    QString startZone = selectedCards[0]->getZone()->getName();
+    int startPlayerId = cardList[0]->getZone()->getPlayer()->getPlayerInfo()->getId();
+    QString startZone = cardList[0]->getZone()->getName();
 
     auto *cmd = new Command_MoveCard;
     cmd->set_start_player_id(startPlayerId);
@@ -1251,14 +1263,15 @@ void PlayerActions::actMoveCardXCardsFromTop(QList<CardItem *> selectedCards, in
     }
 }
 
-void PlayerActions::actIncPT(QList<CardItem *> selectedCards, int deltaP, int deltaT)
+void PlayerActions::actIncPT(int deltaP, int deltaT)
 {
     int playerid = player->getPlayerInfo()->getId();
 
     QList<const ::google::protobuf::Message *> commandList;
-    for (auto card : selectedCards) {
+    for (const auto &item : player->getGameScene()->selectedItems()) {
+        auto *card = static_cast<CardItem *>(item);
         QString pt = card->getPT();
-        const auto ptList = CardItem::parsePT(pt);
+        const auto ptList = parsePT(pt);
         QString newpt;
         if (ptList.isEmpty()) {
             newpt = QString::number(deltaP) + (deltaT ? "/" + QString::number(deltaT) : "");
@@ -1284,11 +1297,12 @@ void PlayerActions::actIncPT(QList<CardItem *> selectedCards, int deltaP, int de
     player->getGame()->getGameEventHandler()->sendGameCommand(prepareGameCommand(commandList), playerid);
 }
 
-void PlayerActions::actResetPT(QList<CardItem *> selectedCards)
+void PlayerActions::actResetPT()
 {
     int playerid = player->getPlayerInfo()->getId();
     QList<const ::google::protobuf::Message *> commandList;
-    for (auto card : selectedCards) {
+    for (const auto &item : player->getGameScene()->selectedItems()) {
+        auto *card = static_cast<CardItem *>(item);
         QString ptString;
         if (!card->getFaceDown()) { // leave the pt empty if the card is face down
             ExactCard ec = card->getCard();
@@ -1317,32 +1331,68 @@ void PlayerActions::actResetPT(QList<CardItem *> selectedCards)
     }
 }
 
-void PlayerActions::actRequestSetPTDialog(QList<CardItem *> selectedCards)
+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()
 {
     QString oldPT;
+    int playerid = player->getPlayerInfo()->getId();
 
-    for (auto card : selectedCards) {
+    auto sel = player->getGameScene()->selectedItems();
+    for (const auto &item : sel) {
+        auto *card = static_cast<CardItem *>(item);
         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;
+    }
 
-    emit requestSetPTDialog(oldPT);
-}
-
-void PlayerActions::actSetPT(QList<CardItem *> selectedCards, const QString &pt)
-{
-    int playerid = player->getPlayerInfo()->getId();
-
-    const auto ptList = CardItem::parsePT(pt);
+    const auto ptList = parsePT(pt);
     bool empty = ptList.isEmpty();
 
     QList<const ::google::protobuf::Message *> commandList;
-    for (auto card : selectedCards) {
+    for (const auto &item : sel) {
+        auto *card = static_cast<CardItem *>(item);
         auto *cmd = new Command_SetCardAttr;
         QString newpt = QString();
         if (!empty) {
-            const auto oldpt = CardItem::parsePT(card->getPT());
+            const auto oldpt = parsePT(card->getPT());
             int ptIter = 0;
             for (const auto &_item : ptList) {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
@@ -1382,69 +1432,44 @@ void PlayerActions::actDrawArrow()
     }
 }
 
-void PlayerActions::actIncP(QList<CardItem *> selectedCards)
+void PlayerActions::actIncP()
 {
-    actIncPT(selectedCards, 1, 0);
+    actIncPT(1, 0);
 }
 
-void PlayerActions::actDecP(QList<CardItem *> selectedCards)
+void PlayerActions::actDecP()
 {
-    actIncPT(selectedCards, -1, 0);
+    actIncPT(-1, 0);
 }
 
-void PlayerActions::actIncT(QList<CardItem *> selectedCards)
+void PlayerActions::actIncT()
 {
-    actIncPT(selectedCards, 0, 1);
+    actIncPT(0, 1);
 }
 
-void PlayerActions::actDecT(QList<CardItem *> selectedCards)
+void PlayerActions::actDecT()
 {
-    actIncPT(selectedCards, 0, -1);
+    actIncPT(0, -1);
 }
 
-void PlayerActions::actIncPT(QList<CardItem *> selectedCards)
+void PlayerActions::actIncPT()
 {
-    actIncPT(selectedCards, 1, 1);
+    actIncPT(1, 1);
 }
 
-void PlayerActions::actDecPT(QList<CardItem *> selectedCards)
+void PlayerActions::actDecPT()
 {
-    actIncPT(selectedCards, -1, -1);
+    actIncPT(-1, -1);
 }
 
-void PlayerActions::actFlowP(QList<CardItem *> selectedCards)
+void PlayerActions::actFlowP()
 {
-    actIncPT(selectedCards, 1, -1);
+    actIncPT(1, -1);
 }
 
-void PlayerActions::actFlowT(QList<CardItem *> selectedCards)
+void PlayerActions::actFlowT()
 {
-    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));
+    actIncPT(-1, 1);
 }
 
 void AnnotationDialog::keyPressEvent(QKeyEvent *event)
@@ -1457,22 +1482,33 @@ void AnnotationDialog::keyPressEvent(QKeyEvent *event)
     QInputDialog::keyPressEvent(event);
 }
 
-void PlayerActions::actRequestSetAnnotationDialog(QList<CardItem *> selectedCards)
+void PlayerActions::actSetAnnotation()
 {
     QString oldAnnotation;
-    for (auto card : selectedCards) {
+    auto sel = player->getGameScene()->selectedItems();
+    for (const auto &item : sel) {
+        auto *card = static_cast<CardItem *>(item);
         if (!card->getAnnotation().isEmpty()) {
             oldAnnotation = card->getAnnotation();
         }
     }
 
-    emit requestSetAnnotationDialog(oldAnnotation);
-}
+    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);
 
-void PlayerActions::actSetAnnotation(QList<CardItem *> selectedCards, const QString &annotation)
-{
     QList<const ::google::protobuf::Message *> commandList;
-    for (auto card : selectedCards) {
+    for (const auto &item : sel) {
+        auto *card = static_cast<CardItem *>(item);
         auto *cmd = new Command_SetCardAttr;
         cmd->set_zone(card->getZone()->getName().toStdString());
         cmd->set_card_id(card->getId());
@@ -1493,10 +1529,12 @@ void PlayerActions::actAttach()
     card->drawAttachArrow();
 }
 
-void PlayerActions::actUnattach(QList<CardItem *> selectedCards)
+void PlayerActions::actUnattach()
 {
     QList<const ::google::protobuf::Message *> commandList;
-    for (auto card : selectedCards) {
+    for (QGraphicsItem *item : player->getGameScene()->selectedItems()) {
+        auto *card = static_cast<CardItem *>(item);
+
         if (!card->getAttachedTo()) {
             continue;
         }
@@ -1509,105 +1547,70 @@ void PlayerActions::actUnattach(QList<CardItem *> selectedCards)
     sendGameCommand(prepareGameCommand(commandList));
 }
 
-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)
+void PlayerActions::actCardCounterTrigger()
 {
+    auto *action = static_cast<QAction *>(sender());
+    int counterId = action->data().toInt() / 1000;
     QList<const ::google::protobuf::Message *> commandList;
-    for (auto card : selectedCards) {
-        int oldValue = card->getCounters().value(counterId, 0);
-        int newValue = oldValue + offset;
-
-        // Early exit optimization: server enforces [0, MAX_COUNTERS_ON_CARD].
-        // Compare clamped value to allow recovery from invalid states.
-        int clampedValue = qBound(0, newValue, MAX_COUNTERS_ON_CARD);
-        if (clampedValue != 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);
+    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);
 
-    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_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(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_COUNTERS_ON_CARD) {
-                continue;
+            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;
             }
 
-            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());
+            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;
         }
+        default:;
     }
-
-    if (!commandList.isEmpty()) {
-        sendGameCommand(prepareGameCommand(commandList));
-    }
+    sendGameCommand(prepareGameCommand(commandList));
 }
 
 /**
@@ -1622,8 +1625,14 @@ static bool isUnwritableRevealZone(CardZoneLogic *zone)
     return false;
 }
 
-void PlayerActions::playSelectedCards(QList<CardItem *> selectedCards, const bool faceDown)
+void PlayerActions::playSelectedCards(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.
@@ -1637,19 +1646,19 @@ void PlayerActions::playSelectedCards(QList<CardItem *> selectedCards, const boo
     }
 }
 
-void PlayerActions::actPlay(QList<CardItem *> selectedCards)
+void PlayerActions::actPlay()
 {
-    playSelectedCards(selectedCards, false);
+    playSelectedCards(false);
 }
 
-void PlayerActions::actPlayFacedown(QList<CardItem *> selectedCards)
+void PlayerActions::actPlayFacedown()
 {
-    playSelectedCards(selectedCards, true);
+    playSelectedCards(true);
 }
 
-void PlayerActions::actHide(QList<CardItem *> selectedCards)
+void PlayerActions::actHide()
 {
-    for (const auto &item : selectedCards) {
+    for (const auto &item : player->getGameScene()->selectedItems()) {
         auto *card = static_cast<CardItem *>(item);
         if (card && isUnwritableRevealZone(card->getZone())) {
             card->getZone()->removeCard(card);
@@ -1657,7 +1666,7 @@ void PlayerActions::actHide(QList<CardItem *> selectedCards)
     }
 }
 
-void PlayerActions::actReveal(QList<CardItem *> selectedCards, QAction *action)
+void PlayerActions::actReveal(QAction *action)
 {
     const int otherPlayerId = action->data().toInt();
 
@@ -1666,7 +1675,9 @@ void PlayerActions::actReveal(QList<CardItem *> selectedCards, QAction *action)
         cmd.set_player_id(otherPlayerId);
     }
 
-    for (auto card : selectedCards) {
+    QList<QGraphicsItem *> sel = player->getGameScene()->selectedItems();
+    while (!sel.isEmpty()) {
+        const auto *card = qgraphicsitem_cast<CardItem *>(sel.takeFirst());
         if (!cmd.has_zone_name()) {
             cmd.set_zone_name(card->getZone()->getName().toStdString());
         }
@@ -1748,14 +1759,19 @@ void PlayerActions::actRevealRandomGraveyardCard(int revealToPlayerId)
     sendGameCommand(cmd);
 }
 
-void PlayerActions::cardMenuAction(QList<CardItem *> selectedCards, CardMenuActionType type)
+void PlayerActions::cardMenuAction()
 {
-    QList<CardItem *> cardList = selectedCards;
+    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<const ::google::protobuf::Message *> commandList;
-    if (type <= cmClone) {
+    if (a->data().toInt() <= (int)cmClone) {
         for (const auto &card : cardList) {
-            switch (type) {
+            switch (static_cast<CardMenuActionType>(a->data().toInt())) {
                 // Leaving both for compatibility with server
                 case cmUntap:
                     // fallthrough
@@ -1823,7 +1839,7 @@ void PlayerActions::cardMenuAction(QList<CardItem *> selectedCards, CardMenuActi
             return;
         }
 
-        PlayerLogic *startPlayer = zone->getPlayer();
+        Player *startPlayer = zone->getPlayer();
         if (!startPlayer) {
             return;
         }
@@ -1836,7 +1852,7 @@ void PlayerActions::cardMenuAction(QList<CardItem *> selectedCards, CardMenuActi
             idList.add_card()->set_card_id(i->getId());
         }
 
-        switch (type) {
+        switch (static_cast<CardMenuActionType>(a->data().toInt())) {
             case cmMoveToTopLibrary: {
                 auto *cmd = new Command_MoveCard;
                 cmd->set_start_player_id(startPlayerId);
@@ -1917,34 +1933,6 @@ void PlayerActions::cardMenuAction(QList<CardItem *> selectedCards, CardMenuActi
                 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 3f1960892..1d695578d 100644
--- a/cockatrice/src/game/player/player_actions.h
+++ b/cockatrice/src/game/player/player_actions.h
@@ -2,23 +2,20 @@
  * @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 "../../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 "../dialogs/dlg_create_token.h"
 #include "event_processing_options.h"
-#include "player_logic.h"
+#include "player.h"
 
 #include <QMenu>
 #include <QObject>
 #include <libcockatrice/card/relation/card_relation_type.h>
 #include <libcockatrice/filters/filter_string.h>
+#include <libcockatrice/protocol/pb/card_attributes.pb.h>
 
 namespace google
 {
@@ -28,21 +25,28 @@ class Message;
 }
 } // namespace google
 
+class CardItem;
 class Command_MoveCard;
 class GameEventContext;
 class PendingCommand;
-class PlayerLogic;
+class Player;
 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(PlayerLogic *player);
+    explicit PlayerActions(Player *player);
 
     void sendGameCommand(PendingCommand *pend);
     void sendGameCommand(const google::protobuf::Message &command);
@@ -50,6 +54,13 @@ 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();
 
@@ -58,75 +69,29 @@ 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 actRequestRollDieDialog();
-    void actRollDie(int sides, int count);
-    void actFlipCoin();
-    void actRequestCreateTokenDialog(const QStringList &predefinedTokens);
-    void actCreateToken(TokenInfo tokenToCreate);
+    void actRollDie();
+    void actCreateToken();
     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 actRequestShuffleTopDialog();
-    void actShuffleTop(int number);
-    void actRequestShuffleBottomDialog();
-    void actShuffleBottom(int number);
+    void actShuffleTop();
+    void actShuffleBottom();
     void actDrawCard();
-    void actRequestDrawCardsDialog();
-    void actDrawCards(int number);
+    void actDrawCards();
     void actUndoDraw();
-    void actRequestMulliganDialog();
-    void actMulligan(int number);
+    void actMulligan();
     void actMulliganSameSize();
     void actMulliganMinusOne();
     void doMulligan(int number);
 
-    void actPlay(QList<CardItem *> selectedCards);
-    void actPlayFacedown(QList<CardItem *> selectedCards);
-    void actHide(QList<CardItem *> selectedCards);
+    void actPlay();
+    void actPlayFacedown();
+    void actHide();
 
     void actMoveTopCardToPlay();
     void actMoveTopCardToPlayFaceDown();
@@ -136,14 +101,10 @@ public slots:
     void actMoveTopCardsToGraveFaceDown();
     void actMoveTopCardsToExile();
     void actMoveTopCardsToExileFaceDown();
-    void actRequestMoveTopCardsUntilDialog();
-    void moveTopCardsUntil(const QString &expr, MoveTopCardsUntilOptions options);
+    void actMoveTopCardsUntil();
     void actMoveTopCardToBottom();
-    void actRequestMoveTopCardsToDialog(const QString &targetZone, const QString &zoneDisplayName, bool faceDown);
-    void moveTopCardsTo(int number, const QString &targetZone, bool faceDown);
     void actDrawBottomCard();
-    void actRequestDrawBottomCardsDialog();
-    void actDrawBottomCards(int number);
+    void actDrawBottomCards();
     void actMoveBottomCardToPlay();
     void actMoveBottomCardToPlayFaceDown();
     void actMoveBottomCardToGrave();
@@ -153,8 +114,6 @@ public slots:
     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();
@@ -162,12 +121,10 @@ public slots:
 
     void actViewLibrary();
     void actViewHand();
-    void actRequestViewTopCardsDialog();
-    void actViewTopCards(int number);
-    void actRequestViewBottomCardsDialog();
-    void actViewBottomCards(int number);
-    void actAlwaysRevealTopCard(bool alwaysRevealTopCard);
-    void actAlwaysLookAtTopCard(bool alwaysRevealTopCard);
+    void actViewTopCards();
+    void actViewBottomCards();
+    void actAlwaysRevealTopCard();
+    void actAlwaysLookAtTopCard();
     void actViewGraveyard();
     void actLendLibrary(int lendToPlayerId);
     void actRevealTopCards(int revealToPlayerId, int amount);
@@ -182,44 +139,34 @@ public slots:
     void actCreateRelatedCard();
     void actCreateAllRelatedCards();
 
-    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 actMoveCardXCardsFromTop();
+    void actCardCounterTrigger();
     void actAttach();
-    void actUnattach(QList<CardItem *> selectedCards);
+    void actUnattach();
     void actDrawArrow();
-    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 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 actRevealHand(int revealToPlayerId);
     void actRevealRandomHandCard(int revealToPlayerId);
     void actRevealLibrary(int revealToPlayerId);
 
     void actSortHand();
 
-    void cardMenuAction(QList<CardItem *> selectedCards, CardMenuActionType type);
+    void cardMenuAction();
 
 private:
-    PlayerLogic *player;
+    Player *player;
 
     int defaultNumberTopCards = 1;
     int defaultNumberTopCardsToPlaceBelow = 1;
@@ -231,23 +178,27 @@ private:
 
     bool movingCardsUntil;
     QTimer *moveTopCardTimer;
+    QStringList movingCardsUntilExprs = {};
+    int movingCardsUntilNumberOfHits = 1;
+    bool movingCardsUntilAutoPlay = false;
     FilterString movingCardsUntilFilter;
     int movingCardsUntilCounter = 0;
-    MoveTopCardsUntilOptions movingCardsUntilOptions;
 
-    bool lastRelatedCreationSucceeded = false;
+    void moveTopCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown);
+    void moveBottomCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown);
 
     void createCard(const CardItem *sourceCard,
                     const QString &dbCardName,
                     CardRelationType attach = CardRelationType::DoesNotAttach,
                     bool persistent = false);
+    bool createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation);
 
-    void playSelectedCards(QList<CardItem *> selectedCards, bool faceDown = false);
+    void playSelectedCards(bool faceDown = false);
 
     void cmdSetTopCard(Command_MoveCard &cmd);
     void cmdSetBottomCard(Command_MoveCard &cmd);
 
-    void offsetCardCounter(QList<CardItem *> selectedCards, int counterId, int offset);
+    QVariantList parsePT(const QString &pt);
 };
 
 #endif // COCKATRICE_PLAYER_ACTIONS_H
diff --git a/cockatrice/src/game_graphics/player/player_area.cpp b/cockatrice/src/game/player/player_area.cpp
similarity index 100%
rename from cockatrice/src/game_graphics/player/player_area.cpp
rename to cockatrice/src/game/player/player_area.cpp
diff --git a/cockatrice/src/game_graphics/player/player_area.h b/cockatrice/src/game/player/player_area.h
similarity index 91%
rename from cockatrice/src/game_graphics/player/player_area.h
rename to cockatrice/src/game/player/player_area.h
index d73547f81..ec0d23cb6 100644
--- a/cockatrice/src/game_graphics/player/player_area.h
+++ b/cockatrice/src/game/player/player_area.h
@@ -1,13 +1,13 @@
 /**
  * @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 "../board/graphics_item_type.h"
+#include "../../game_graphics/board/graphics_item_type.h"
 #include "QGraphicsItem"
 
 /**
diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp
index bc48298f7..f4c3840e0 100644
--- a/cockatrice/src/game/player/player_event_handler.cpp
+++ b/cockatrice/src/game/player/player_event_handler.cpp
@@ -1,13 +1,12 @@
 #include "player_event_handler.h"
 
-#include "../../game_graphics/board/arrow_item.h"
-#include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/zones/view_zone.h"
 #include "../../interface/widgets/tabs/tab_game.h"
-#include "../board/arrow_data.h"
+#include "../board/arrow_item.h"
+#include "../board/card_item.h"
 #include "../board/card_list.h"
+#include "../zones/view_zone.h"
+#include "player.h"
 #include "player_actions.h"
-#include "player_logic.h"
 
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
@@ -23,7 +22,6 @@
 #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>
@@ -32,12 +30,10 @@
 #include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_set_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_shuffle.pb.h>
-#include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/zone_names.h>
 
-PlayerEventHandler::PlayerEventHandler(PlayerLogic *_player) : QObject(_player), player(_player)
+PlayerEventHandler::PlayerEventHandler(Player *_player) : player(_player)
 {
-    connect(this, &PlayerEventHandler::requestCardMenuUpdate, player, &PlayerLogic::requestCardMenuUpdate);
 }
 
 void PlayerEventHandler::eventGameSay(const Event_GameSay &event)
@@ -64,6 +60,7 @@ 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!";
@@ -93,40 +90,25 @@ void PlayerEventHandler::eventRollDie(const Event_RollDie &event)
 
 void PlayerEventHandler::eventCreateArrow(const Event_CreateArrow &event)
 {
-    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();
-            }
-        }
+    ArrowItem *arrow = player->addArrow(event.arrow_info());
+    if (!arrow) {
+        return;
     }
 
-    emit player->arrowCreateRequested(data);
-
-    if (startPlayer && targetPlayer && !startCardName.isEmpty() &&
-        (data->isPlayerTargeted() || !targetCardName.isEmpty())) {
-        emit logCreateArrow(player, startPlayer, startCardName, targetPlayer, targetCardName, data->isPlayerTargeted());
+    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);
     }
 }
 
 void PlayerEventHandler::eventDeleteArrow(const Event_DeleteArrow &event)
 {
-    emit player->arrowDeleted(player->getPlayerInfo()->getId(), event.arrow_id());
+    player->delArrow(event.arrow_id());
 }
 
 void PlayerEventHandler::eventCreateToken(const Event_CreateToken &event)
@@ -168,8 +150,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) {
-            setCardAttrHelper(context, cards.at(i), event.attribute(), QString::fromStdString(event.attr_value()), true,
-                              options);
+            player->getPlayerActions()->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");
@@ -180,62 +162,8 @@ void PlayerEventHandler::eventSetCardAttr(const Event_SetCardAttr &event,
             qWarning() << "PlayerEventHandler::eventSetCardAttr: card id=" << event.card_id() << "not found";
             return;
         }
-        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;
-        }
+        player->getPlayerActions()->setCardAttrHelper(context, card, event.attribute(),
+                                                      QString::fromStdString(event.attr_value()), false, options);
     }
 }
 
@@ -253,7 +181,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());
-    emit requestCardMenuUpdate(card);
+    player->getPlayerMenu()->updateCardMenu(card);
     emit logSetCardCounter(player, card->getName(), event.counter_id(), event.counter_value(), oldValue);
 }
 
@@ -264,7 +192,7 @@ void PlayerEventHandler::eventCreateCounter(const Event_CreateCounter &event)
 
 void PlayerEventHandler::eventSetCounter(const Event_SetCounter &event)
 {
-    CounterState *ctr = player->getCounters().value(event.counter_id(), nullptr);
+    AbstractCounter *ctr = player->getCounters().value(event.counter_id(), 0);
     if (!ctr) {
         return;
     }
@@ -280,7 +208,7 @@ void PlayerEventHandler::eventDelCounter(const Event_DelCounter &event)
 
 void PlayerEventHandler::eventDumpZone(const Event_DumpZone &event)
 {
-    PlayerLogic *zoneOwner = player->getGame()->getPlayerManager()->getPlayers().value(event.zone_owner_id(), 0);
+    Player *zoneOwner = player->getGame()->getPlayerManager()->getPlayers().value(event.zone_owner_id(), 0);
     if (!zoneOwner) {
         return;
     }
@@ -293,13 +221,13 @@ void PlayerEventHandler::eventDumpZone(const Event_DumpZone &event)
 
 void PlayerEventHandler::eventMoveCard(const Event_MoveCard &event, const GameEventContext &context)
 {
-    PlayerLogic *startPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.start_player_id());
+    Player *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);
-    PlayerLogic *targetPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.target_player_id());
+    Player *targetPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.target_player_id());
     if (!targetPlayer) {
         return;
     }
@@ -370,8 +298,29 @@ void PlayerEventHandler::eventMoveCard(const Event_MoveCard &event, const GameEv
 
     targetZone->addCard(card, true, x, y);
 
-    emit cardZoneChanged(card, startZone == targetZone);
-    emit requestCardMenuUpdate(card);
+    // 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();
+
+        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 == ZoneNames::DECK &&
         targetZone->getName() == ZoneNames::STACK) {
@@ -398,7 +347,7 @@ void PlayerEventHandler::eventFlipCard(const Event_FlipCard &event)
 
     emit logFlipCard(player, card->getName(), event.face_down());
     card->setFaceDown(event.face_down());
-    emit requestCardMenuUpdate(card);
+    player->getPlayerMenu()->updateCardMenu(card);
 }
 
 void PlayerEventHandler::eventDestroyCard(const Event_DestroyCard &event)
@@ -426,8 +375,8 @@ void PlayerEventHandler::eventDestroyCard(const Event_DestroyCard &event)
 
 void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event)
 {
-    const QMap<int, PlayerLogic *> &playerList = player->getGame()->getPlayerManager()->getPlayers();
-    PlayerLogic *targetPlayer = nullptr;
+    const QMap<int, Player *> &playerList = player->getGame()->getPlayerManager()->getPlayers();
+    Player *targetPlayer = nullptr;
     CardZoneLogic *targetZone = nullptr;
     CardItem *targetCard = nullptr;
     if (event.has_target_player_id()) {
@@ -467,7 +416,7 @@ void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event)
     } else {
         emit logUnattachCard(player, startCard->getName());
     }
-    emit requestCardMenuUpdate(startCard);
+    player->getPlayerMenu()->updateCardMenu(startCard);
 }
 
 void PlayerEventHandler::eventDrawCards(const Event_DrawCards &event)
@@ -504,7 +453,7 @@ void PlayerEventHandler::eventRevealCards(const Event_RevealCards &event, EventP
     if (!zone) {
         return;
     }
-    PlayerLogic *otherPlayer = nullptr;
+    Player *otherPlayer = nullptr;
     if (event.has_other_player_id()) {
         otherPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.other_player_id());
         if (!otherPlayer) {
@@ -553,7 +502,7 @@ void PlayerEventHandler::eventRevealCards(const Event_RevealCards &event, EventP
         }
 
         if (!options.testFlag(SKIP_REVEAL_WINDOW) && showZoneView && !cardList.isEmpty()) {
-            emit player->requestRevealedZoneView(player, zone, cardList, event.grant_write_access());
+            player->getGameScene()->addRevealedZoneView(player, zone, cardList, event.grant_write_access());
         }
 
         emit logRevealCards(player, zone, cardId, cardName, otherPlayer, false,
@@ -579,18 +528,6 @@ 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,
@@ -654,11 +591,8 @@ 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 cfd82933f..5d1ddd4b4 100644
--- a/cockatrice/src/game/player/player_event_handler.h
+++ b/cockatrice/src/game/player/player_event_handler.h
@@ -1,21 +1,20 @@
 /**
  * @file player_event_handler.h
  * @ingroup GameLogicPlayers
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COCKATRICE_PLAYER_EVENT_HANDLER_H
 #define COCKATRICE_PLAYER_EVENT_HANDLER_H
 #include "event_processing_options.h"
 
 #include <QObject>
-#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>
 
 class CardItem;
 class CardZoneLogic;
-class PlayerLogic;
+class Player;
 class Event_AttachCard;
 class Event_ChangeZoneProperties;
 class Event_CreateArrow;
@@ -35,58 +34,53 @@ class Event_SetCardAttr;
 class Event_SetCardCounter;
 class Event_SetCounter;
 class Event_Shuffle;
-class Event_GameLogNotice;
-
 class PlayerEventHandler : public QObject
 {
 
     Q_OBJECT
 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,
+    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,
-                        PlayerLogic *targetPlayer,
+                        Player *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,
+    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(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,
+    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,
-                        PlayerLogic *otherPlayer,
+                        Player *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);
+    void logAlwaysRevealTopCard(Player *player, CardZoneLogic *zone, bool reveal);
+    void logAlwaysLookAtTopCard(Player *player, CardZoneLogic *zone, bool reveal);
 
 public:
-    PlayerEventHandler(PlayerLogic *player);
+    PlayerEventHandler(Player *player);
 
     void processGameEvent(GameEvent::GameEventType type,
                           const GameEvent &event,
@@ -113,17 +107,9 @@ public:
     void eventDrawCards(const Event_DrawCards &event);
     void eventRevealCards(const Event_RevealCards &event, EventProcessingOptions options);
     void eventChangeZoneProperties(const Event_ChangeZoneProperties &event);
-    void eventGameLogNotice(const Event_GameLogNotice &event);
 
 private:
-    PlayerLogic *player;
-
-    void setCardAttrHelper(const GameEventContext &context,
-                           CardItem *card,
-                           CardAttribute attribute,
-                           const QString &avalue,
-                           bool allCards,
-                           EventProcessingOptions options);
+    Player *player;
 };
 
 #endif // COCKATRICE_PLAYER_EVENT_HANDLER_H
diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.cpp b/cockatrice/src/game/player/player_graphics_item.cpp
similarity index 63%
rename from cockatrice/src/game_graphics/player/player_graphics_item.cpp
rename to cockatrice/src/game/player/player_graphics_item.cpp
index e0194abda..bcc4b7f72 100644
--- a/cockatrice/src/game_graphics/player/player_graphics_item.cpp
+++ b/cockatrice/src/game/player/player_graphics_item.cpp
@@ -1,54 +1,20 @@
 #include "player_graphics_item.h"
 
-#include "../../game/player/player_actions.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../board/abstract_card_item.h"
-#include "../board/counter_general.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 "menu/player_menu.h"
-#include "player_dialogs.h"
 
-#include <QGraphicsView>
-
-PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player)
+PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player)
 {
     connect(&SettingsCache::instance(), &SettingsCache::horizontalHandChanged, this,
             &PlayerGraphicsItem::rearrangeZones);
     connect(&SettingsCache::instance(), &SettingsCache::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);
-
-    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);
+    connect(player, &Player::rearrangeCounters, this, &PlayerGraphicsItem::rearrangeCounters);
 
     playerArea = new PlayerArea(this);
 
@@ -59,11 +25,6 @@ PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player)
 
     initializeZones();
 
-    connect(player, &PlayerLogic::addViewCustomZoneActionToCustomZoneMenu, this,
-            &PlayerGraphicsItem::onCustomZoneAdded);
-
-    playerMenu->setMenusForGraphicItems();
-
     connect(tableZoneGraphicsItem, &TableZone::sizeChanged, this, &PlayerGraphicsItem::updateBoundingRect);
 
     updateBoundingRect();
@@ -74,12 +35,17 @@ PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player)
 
 void PlayerGraphicsItem::retranslateUi()
 {
-    playerMenu->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)
@@ -110,33 +76,18 @@ void PlayerGraphicsItem::initializeZones()
     rfgZoneGraphicsItem = new PileZone(player->getRfgZone(), this);
     rfgZoneGraphicsItem->setPos(base + QPointF(0, 2 * h + h2 + 10));
 
-    tableZoneGraphicsItem = new TableZone(player->getTableZone(), mirrored, this);
+    tableZoneGraphicsItem = new TableZone(player->getTableZone(), this);
     connect(tableZoneGraphicsItem, &TableZone::sizeChanged, this, &PlayerGraphicsItem::updateBoundingRect);
-    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
@@ -177,53 +128,24 @@ 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);
-    } 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()) {
+    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;
@@ -236,11 +158,11 @@ void PlayerGraphicsItem::rearrangeZones()
     if (SettingsCache::instance().getHorizontalHand()) {
         if (mirrored) {
             if (player->getHandZone()->contentsKnown()) {
-                handVisible = true;
+                player->getPlayerInfo()->setHandVisible(true);
                 handZoneGraphicsItem->setPos(base);
                 base += QPointF(0, handZoneGraphicsItem->boundingRect().height());
             } else {
-                handVisible = false;
+                player->getPlayerInfo()->setHandVisible(false);
             }
 
             stackZoneGraphicsItem->setPos(base);
@@ -254,16 +176,16 @@ void PlayerGraphicsItem::rearrangeZones()
             base += QPointF(0, tableZoneGraphicsItem->boundingRect().height());
 
             if (player->getHandZone()->contentsKnown()) {
-                handVisible = true;
+                player->getPlayerInfo()->setHandVisible(true);
                 handZoneGraphicsItem->setPos(base);
             } else {
-                handVisible = false;
+                player->getPlayerInfo()->setHandVisible(false);
             }
         }
         handZoneGraphicsItem->setWidth(tableZoneGraphicsItem->getWidth() +
                                        stackZoneGraphicsItem->boundingRect().width());
     } else {
-        handVisible = true;
+        player->getPlayerInfo()->setHandVisible(true);
 
         handZoneGraphicsItem->setPos(base);
         base += QPointF(handZoneGraphicsItem->boundingRect().width(), 0);
@@ -273,7 +195,7 @@ void PlayerGraphicsItem::rearrangeZones()
 
         tableZoneGraphicsItem->setPos(base);
     }
-    handZoneGraphicsItem->setVisible(handVisible);
+    handZoneGraphicsItem->setVisible(player->getPlayerInfo()->getHandVisible());
     handZoneGraphicsItem->updateOrientation();
     tableZoneGraphicsItem->reorganizeCards();
     updateBoundingRect();
@@ -285,7 +207,8 @@ void PlayerGraphicsItem::updateBoundingRect()
     prepareGeometryChange();
     qreal width = CardDimensions::HEIGHT_F + 15 + counterAreaWidth + stackZoneGraphicsItem->boundingRect().width();
     if (SettingsCache::instance().getHorizontalHand()) {
-        qreal handHeight = handVisible ? handZoneGraphicsItem->boundingRect().height() : 0;
+        qreal handHeight =
+            player->getPlayerInfo()->getHandVisible() ? handZoneGraphicsItem->boundingRect().height() : 0;
         bRect = QRectF(0, 0, width + tableZoneGraphicsItem->boundingRect().width(),
                        tableZoneGraphicsItem->boundingRect().height() + handHeight);
     } else {
diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.h b/cockatrice/src/game/player/player_graphics_item.h
similarity index 74%
rename from cockatrice/src/game_graphics/player/player_graphics_item.h
rename to cockatrice/src/game/player/player_graphics_item.h
index d02234ded..cba664dd9 100644
--- a/cockatrice/src/game_graphics/player/player_graphics_item.h
+++ b/cockatrice/src/game/player/player_graphics_item.h
@@ -1,21 +1,18 @@
 /**
  * @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 "../../game/player/player_logic.h"
-#include "../board/abstract_counter.h"
 #include "../game_scene.h"
+#include "player.h"
 
 #include <QGraphicsObject>
 
 class HandZone;
 class PileZone;
-class PlayerDialogs;
-class PlayerMenu;
 class PlayerTarget;
 class StackZone;
 class TableZone;
@@ -37,7 +34,7 @@ public:
 
     static constexpr int counterAreaWidth = 55;
 
-    explicit PlayerGraphicsItem(PlayerLogic *player);
+    explicit PlayerGraphicsItem(Player *player);
     void initializeZones();
 
     [[nodiscard]] QRectF boundingRect() const override;
@@ -57,16 +54,11 @@ public:
         return static_cast<GameScene *>(scene());
     }
 
-    PlayerLogic *getLogic() const
+    Player *getPlayer() const
     {
         return player;
     }
 
-    [[nodiscard]] PlayerMenu *getPlayerMenu() const
-    {
-        return playerMenu;
-    }
-
     PlayerArea *getPlayerArea() const
     {
         return playerArea;
@@ -77,11 +69,6 @@ public:
         return playerTarget;
     }
 
-    CardZone *getZoneGraphicsItem(const QString &name) const
-    {
-        return zoneGraphicsItems.value(name, nullptr);
-    }
-
     [[nodiscard]] PileZone *getDeckZoneGraphicsItem() const
     {
         return deckZoneGraphicsItem;
@@ -115,26 +102,16 @@ 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);
 
 private:
-    PlayerLogic *player;
-    PlayerMenu *playerMenu;
-    PlayerDialogs *playerDialogs;
+    Player *player;
     PlayerArea *playerArea;
     PlayerTarget *playerTarget;
-    QMap<int, AbstractCounter *> counterWidgets;
-    QMap<QString, CardZone *> zoneGraphicsItems;
     PileZone *deckZoneGraphicsItem;
     PileZone *sideboardGraphicsItem;
     PileZone *graveyardZoneGraphicsItem;
@@ -144,11 +121,11 @@ private:
     HandZone *handZoneGraphicsItem;
     QRectF bRect;
     bool mirrored;
-    bool handVisible = false;
 
 private slots:
     void updateBoundingRect();
     void rearrangeZones();
+    void rearrangeCounters();
 };
 
 #endif // COCKATRICE_PLAYER_GRAPHICS_ITEM_H
diff --git a/cockatrice/src/game/player/player_info.cpp b/cockatrice/src/game/player/player_info.cpp
index c4debde0f..8507f75eb 100644
--- a/cockatrice/src/game/player/player_info.cpp
+++ b/cockatrice/src/game/player/player_info.cpp
@@ -1,7 +1,7 @@
 #include "player_info.h"
 
 PlayerInfo::PlayerInfo(const ServerInfo_User &info, int _id, bool _local, bool _judge)
-    : id(_id), local(_local), judge(_judge)
+    : id(_id), local(_local), judge(_judge), handVisible(false)
 {
     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 4ec39edbd..2e9b49d6d 100644
--- a/cockatrice/src/game/player/player_info.h
+++ b/cockatrice/src/game/player/player_info.h
@@ -1,13 +1,13 @@
 /**
  * @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 "../../game_graphics/player/player_target.h"
+#include "player_target.h"
 
 #include <QObject>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
@@ -22,6 +22,7 @@ public:
     int id;
     bool local;
     bool judge;
+    bool handVisible;
 
     int getId() const
     {
@@ -50,6 +51,16 @@ 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_graphics/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp
similarity index 92%
rename from cockatrice/src/game_graphics/player/player_list_widget.cpp
rename to cockatrice/src/game/player/player_list_widget.cpp
index 6b1cf6cc6..9506e0729 100644
--- a/cockatrice/src/game_graphics/player/player_list_widget.cpp
+++ b/cockatrice/src/game/player/player_list_widget.cpp
@@ -43,9 +43,8 @@ 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();
@@ -107,14 +106,12 @@ 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()) {
@@ -129,16 +126,13 @@ 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());
@@ -147,35 +141,30 @@ 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));
 }
@@ -204,14 +193,13 @@ 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());
             }
@@ -223,9 +211,8 @@ 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_graphics/player/player_list_widget.h b/cockatrice/src/game/player/player_list_widget.h
similarity index 96%
rename from cockatrice/src/game_graphics/player/player_list_widget.h
rename to cockatrice/src/game/player/player_list_widget.h
index a53cfa989..8f1487563 100644
--- a/cockatrice/src/game_graphics/player/player_list_widget.h
+++ b/cockatrice/src/game/player/player_list_widget.h
@@ -1,13 +1,13 @@
 /**
  * @file player_list_widget.h
  * @ingroup GameWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef PLAYERLISTWIDGET_H
 #define PLAYERLISTWIDGET_H
 
-#include "../../game/player/player_logic.h"
+#include "player.h"
 
 #include <QIcon>
 #include <QMap>
diff --git a/cockatrice/src/game/player/player_manager.cpp b/cockatrice/src/game/player/player_manager.cpp
index 6772d3ff1..e283d2196 100644
--- a/cockatrice/src/game/player/player_manager.cpp
+++ b/cockatrice/src/game/player/player_manager.cpp
@@ -1,38 +1,35 @@
 #include "player_manager.h"
 
 #include "../abstract_game.h"
-#include "player_logic.h"
+#include "player.h"
 
 PlayerManager::PlayerManager(AbstractGame *_game,
                              int _localPlayerId,
                              bool _localPlayerIsJudge,
                              bool localPlayerIsSpectator)
-    : QObject(_game), game(_game), players(QMap<int, PlayerLogic *>()), localPlayerId(_localPlayerId),
+    : QObject(_game), game(_game), players(QMap<int, Player *>()), localPlayerId(_localPlayerId),
       localPlayerIsJudge(_localPlayerIsJudge), localPlayerIsSpectator(localPlayerIsSpectator)
 {
 }
 
 bool PlayerManager::isMainPlayerConceded() const
 {
-    PlayerLogic *player = players.value(localPlayerId, nullptr);
+    Player *player = players.value(localPlayerId, nullptr);
     return player && player->getConceded();
 }
 
-PlayerLogic *PlayerManager::getActiveLocalPlayer(int activePlayer) const
+Player *PlayerManager::getActiveLocalPlayer(int activePlayer) const
 {
-    PlayerLogic *active = players.value(activePlayer, 0);
-    if (active) {
-        if (active->getPlayerInfo()->getLocal()) {
+    Player *active = players.value(activePlayer, 0);
+    if (active)
+        if (active->getPlayerInfo()->getLocal())
             return active;
-        }
-    }
 
-    QMapIterator<int, PlayerLogic *> playerIterator(players);
+    QMapIterator<int, Player *> playerIterator(players);
     while (playerIterator.hasNext()) {
-        PlayerLogic *temp = playerIterator.next().value();
-        if (temp->getPlayerInfo()->getLocal()) {
+        Player *temp = playerIterator.next().value();
+        if (temp->getPlayerInfo()->getLocal())
             return temp;
-        }
     }
 
     return nullptr;
@@ -43,11 +40,11 @@ bool PlayerManager::isLocalPlayer(int playerId)
     return game->getGameState()->getIsLocalGame() || playerId == localPlayerId;
 }
 
-PlayerLogic *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info)
+Player *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info)
 {
-    auto *newPlayer = new PlayerLogic(info, playerId, isLocalPlayer(playerId) || game->getGameState()->getIsLocalGame(),
-                                      isJudge(), getGame());
-    connect(newPlayer, &PlayerLogic::concededChanged, this, &PlayerManager::onPlayerConceded);
+    auto *newPlayer = new Player(info, playerId, isLocalPlayer(playerId) || game->getGameState()->getIsLocalGame(),
+                                 isJudge(), getGame());
+    connect(newPlayer, &Player::concededChanged, this, &PlayerManager::onPlayerConceded);
     players.insert(playerId, newPlayer);
     emit playerAdded(newPlayer);
     emit playerCountChanged();
@@ -56,7 +53,7 @@ PlayerLogic *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info)
 
 void PlayerManager::removePlayer(int playerId)
 {
-    PlayerLogic *player = getPlayer(playerId);
+    Player *player = getPlayer(playerId);
     if (!player) {
         return;
     }
@@ -66,12 +63,11 @@ void PlayerManager::removePlayer(int playerId)
     player->deleteLater();
 }
 
-PlayerLogic *PlayerManager::getPlayer(int playerId) const
+Player *PlayerManager::getPlayer(int playerId) const
 {
-    PlayerLogic *player = players.value(playerId, 0);
-    if (!player) {
+    Player *player = players.value(playerId, 0);
+    if (!player)
         return nullptr;
-    }
     return player;
 }
 
diff --git a/cockatrice/src/game/player/player_manager.h b/cockatrice/src/game/player/player_manager.h
index 2f8b87af8..0f813b3e4 100644
--- a/cockatrice/src/game/player/player_manager.h
+++ b/cockatrice/src/game/player/player_manager.h
@@ -1,8 +1,8 @@
 /**
  * @file player_manager.h
  * @ingroup GameLogicPlayers
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COCKATRICE_PLAYER_MANAGER_H
 #define COCKATRICE_PLAYER_MANAGER_H
@@ -12,7 +12,7 @@
 #include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
 
 class AbstractGame;
-class PlayerLogic;
+class Player;
 class PlayerManager : public QObject
 {
     Q_OBJECT
@@ -21,7 +21,7 @@ public:
     PlayerManager(AbstractGame *_game, int _localPlayerId, bool _localPlayerIsJudge, bool localPlayerIsSpectator);
 
     AbstractGame *game;
-    QMap<int, PlayerLogic *> players;
+    QMap<int, Player *> players;
     int localPlayerId;
     bool localPlayerIsJudge;
     bool localPlayerIsSpectator;
@@ -42,7 +42,7 @@ public:
         return localPlayerId;
     }
 
-    [[nodiscard]] const QMap<int, PlayerLogic *> &getPlayers() const
+    [[nodiscard]] const QMap<int, Player *> &getPlayers() const
     {
         return players;
     }
@@ -52,14 +52,14 @@ public:
         return players.size();
     }
 
-    [[nodiscard]] PlayerLogic *getActiveLocalPlayer(int activePlayer) const;
+    [[nodiscard]] Player *getActiveLocalPlayer(int activePlayer) const;
     bool isLocalPlayer(int playerId);
 
-    PlayerLogic *addPlayer(int playerId, const ServerInfo_User &info);
+    Player *addPlayer(int playerId, const ServerInfo_User &info);
 
     void removePlayer(int playerId);
 
-    [[nodiscard]] PlayerLogic *getPlayer(int playerId) const;
+    [[nodiscard]] Player *getPlayer(int playerId) const;
 
     void onPlayerConceded(int playerId, bool conceded);
 
@@ -106,8 +106,8 @@ public:
     }
 
 signals:
-    void playerAdded(PlayerLogic *player);
-    void playerRemoved(PlayerLogic *player);
+    void playerAdded(Player *player);
+    void playerRemoved(Player *player);
     void activeLocalPlayerConceded();
     void activeLocalPlayerUnconceded();
     void playerConceded(int playerId);
diff --git a/cockatrice/src/game_graphics/player/player_target.cpp b/cockatrice/src/game/player/player_target.cpp
similarity index 92%
rename from cockatrice/src/game_graphics/player/player_target.cpp
rename to cockatrice/src/game/player/player_target.cpp
index 567f3d44d..a7a5cc5e7 100644
--- a/cockatrice/src/game_graphics/player/player_target.cpp
+++ b/cockatrice/src/game/player/player_target.cpp
@@ -1,7 +1,7 @@
 #include "player_target.h"
 
-#include "../../game/player/player_logic.h"
 #include "../../interface/pixel_map_generator.h"
+#include "player.h"
 
 #include <QDebug>
 #include <QPainter>
@@ -9,8 +9,8 @@
 #include <QtMath>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
-PlayerCounter::PlayerCounter(CounterState *state, PlayerLogic *player, QGraphicsItem *parent)
-    : AbstractCounter(state, player, false, false, parent)
+PlayerCounter::PlayerCounter(Player *_player, int _id, const QString &_name, int _value, QGraphicsItem *parent)
+    : AbstractCounter(_player, _id, _name, false, _value, false, parent)
 {
 }
 
@@ -47,7 +47,7 @@ void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*
     painter->drawText(translatedRect, Qt::AlignCenter, QString::number(value));
 }
 
-PlayerTarget::PlayerTarget(PlayerLogic *_owner, QGraphicsItem *parentItem)
+PlayerTarget::PlayerTarget(Player *_owner, QGraphicsItem *parentItem)
     : ArrowTarget(_owner, parentItem), playerCounter(nullptr)
 {
     setCacheMode(DeviceCoordinateCache);
@@ -128,9 +128,8 @@ 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));
@@ -145,21 +144,22 @@ 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(CounterState *state)
+AbstractCounter *PlayerTarget::addCounter(int _counterId, const QString &_name, int _value)
 {
     if (playerCounter) {
         disconnect(playerCounter, nullptr, this, nullptr);
         playerCounter->delCounter();
     }
-    playerCounter = new PlayerCounter(state, owner, this);
+
+    playerCounter = new PlayerCounter(owner, _counterId, _name, _value, 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_graphics/player/player_target.h b/cockatrice/src/game/player/player_target.h
similarity index 69%
rename from cockatrice/src/game_graphics/player/player_target.h
rename to cockatrice/src/game/player/player_target.h
index 67e155660..b60464e12 100644
--- a/cockatrice/src/game_graphics/player/player_target.h
+++ b/cockatrice/src/game/player/player_target.h
@@ -1,25 +1,25 @@
 /**
  * @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 "../board/abstract_counter.h"
 #include "../board/arrow_target.h"
-#include "../board/graphics_item_type.h"
 
 #include <QPixmap>
 
-class PlayerLogic;
+class Player;
 
 class PlayerCounter : public AbstractCounter
 {
     Q_OBJECT
 public:
-    PlayerCounter(CounterState *state, PlayerLogic *player, QGraphicsItem *parent);
+    PlayerCounter(Player *_player, int _id, const QString &_name, int _value, QGraphicsItem *parent = nullptr);
     QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 };
@@ -43,12 +43,12 @@ public:
         return Type;
     }
 
-    explicit PlayerTarget(PlayerLogic *_player = nullptr, QGraphicsItem *parentItem = nullptr);
+    explicit PlayerTarget(Player *_player = nullptr, QGraphicsItem *parentItem = nullptr);
     ~PlayerTarget() override;
     QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
-    AbstractCounter *addCounter(CounterState *state);
+    AbstractCounter *addCounter(int _counterId, const QString &_name, int _value);
 };
 
 #endif
diff --git a/cockatrice/src/game/replay.cpp b/cockatrice/src/game/replay.cpp
index 69f9d8b20..6886f817a 100644
--- a/cockatrice/src/game/replay.cpp
+++ b/cockatrice/src/game/replay.cpp
@@ -2,9 +2,9 @@
 
 #include "../interface/widgets/tabs/tab_game.h"
 
-Replay::Replay(QObject *_parent, GameReplay *_replay, bool isLocalGame) : AbstractGame(_parent)
+Replay::Replay(TabGame *_tab, GameReplay *_replay) : AbstractGame(_tab)
 {
-    gameState = new GameState(this, 0, -1, isLocalGame, {}, false, false, -1, false);
+    gameState = new GameState(this, 0, -1, tab->getTabSupervisor()->getIsLocalGame(), {}, 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 ecb3a10d0..301f47580 100644
--- a/cockatrice/src/game/replay.h
+++ b/cockatrice/src/game/replay.h
@@ -2,8 +2,8 @@
  * @file replay.h
  * @ingroup GameLogic
  * @ingroup Replay
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COCKATRICE_REPLAY_H
 #define COCKATRICE_REPLAY_H
@@ -15,7 +15,7 @@ class Replay : public AbstractGame
     Q_OBJECT
 
 public:
-    explicit Replay(QObject *_parent, GameReplay *_replay, bool isLocalGame);
+    explicit Replay(TabGame *_tab, GameReplay *_replay);
 };
 
 #endif // COCKATRICE_REPLAY_H
diff --git a/cockatrice/src/game_graphics/z_value_layer_manager.h b/cockatrice/src/game/z_value_layer_manager.h
similarity index 94%
rename from cockatrice/src/game_graphics/z_value_layer_manager.h
rename to cockatrice/src/game/z_value_layer_manager.h
index d35ab5c1c..4eb864486 100644
--- a/cockatrice/src/game_graphics/z_value_layer_manager.h
+++ b/cockatrice/src/game/z_value_layer_manager.h
@@ -66,9 +66,12 @@ namespace ZValueLayerManager
  */
 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.
+    /// Zone-level elements like backgrounds and containers
+    Zone,
+    /// Cards rendered in zones (uses sequential Z-values)
+    Card,
+    /// Temporary UI elements like hovered cards and drag items
+    Overlay
 };
 
 /**
diff --git a/cockatrice/src/game_graphics/z_values.h b/cockatrice/src/game/z_values.h
similarity index 100%
rename from cockatrice/src/game_graphics/z_values.h
rename to cockatrice/src/game/z_values.h
diff --git a/cockatrice/src/game_graphics/zones/card_zone.cpp b/cockatrice/src/game/zones/card_zone.cpp
similarity index 86%
rename from cockatrice/src/game_graphics/zones/card_zone.cpp
rename to cockatrice/src/game/zones/card_zone.cpp
index 3457b681e..0c189cd2b 100644
--- a/cockatrice/src/game_graphics/zones/card_zone.cpp
+++ b/cockatrice/src/game/zones/card_zone.cpp
@@ -19,22 +19,19 @@ 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)
@@ -49,14 +46,12 @@ 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_graphics/zones/card_zone.h b/cockatrice/src/game/zones/card_zone.h
similarity index 73%
rename from cockatrice/src/game_graphics/zones/card_zone.h
rename to cockatrice/src/game/zones/card_zone.h
index 4cef6ca80..6fe8157e4 100644
--- a/cockatrice/src/game_graphics/zones/card_zone.h
+++ b/cockatrice/src/game/zones/card_zone.h
@@ -1,15 +1,15 @@
 /**
  * @file card_zone.h
  * @ingroup GameGraphicsZones
- * @brief Base graphics item for zones that contain cards.
+ * @brief TODO: Document this.
  */
 
 #ifndef CARDZONE_H
 #define CARDZONE_H
 
-#include "../../game/zones/card_zone_logic.h"
-#include "../board/abstract_graphics_item.h"
-#include "../board/graphics_item_type.h"
+#include "../../game_graphics/board/abstract_graphics_item.h"
+#include "../../game_graphics/board/graphics_item_type.h"
+#include "logic/card_zone_logic.h"
 
 #include <QLoggingCategory>
 #include <QString>
@@ -40,13 +40,7 @@ protected:
     }
 public slots:
     bool showContextMenu(const QPoint &screenPos);
-    /**
-     * @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);
+    void onCardAdded(CardItem *addedCard);
 
 public:
     enum
diff --git a/cockatrice/src/game_graphics/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp
similarity index 60%
rename from cockatrice/src/game_graphics/zones/hand_zone.cpp
rename to cockatrice/src/game/zones/hand_zone.cpp
index 5885e3630..7badfcca4 100644
--- a/cockatrice/src/game_graphics/zones/hand_zone.cpp
+++ b/cockatrice/src/game/zones/hand_zone.cpp
@@ -1,11 +1,11 @@
 #include "hand_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.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>
@@ -27,20 +27,16 @@ 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().getHorizontalHand()) {
-        for (x = 0; x < getLogic()->getCards().size(); x++) {
-            if (point.x() < static_cast<CardItem *>(getLogic()->getCards().at(x))->scenePos().x()) {
+        for (x = 0; x < getLogic()->getCards().size(); x++)
+            if (point.x() < static_cast<CardItem *>(getLogic()->getCards().at(x))->scenePos().x())
                 break;
-            }
-        }
     } else {
-        x = calcDropIndexFromY(dropPoint.y());
+        for (x = 0; x < getLogic()->getCards().size(); x++)
+            if (point.y() < static_cast<CardItem *>(getLogic()->getCards().at(x))->scenePos().y())
+                break;
     }
 
     Command_MoveCard cmd;
@@ -51,20 +47,18 @@ void HandZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
     cmd.set_x(x);
     cmd.set_y(-1);
 
-    for (int i = 0; i < dragItems.size(); ++i) {
+    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()) {
+    if (SettingsCache::instance().getHorizontalHand())
         return QRectF(0, 0, width, CardDimensions::HEIGHT_F + 10);
-    } else {
-        return QRectF(0, 0, CardDimensions::WIDTH_F * 1.5, zoneHeight);
-    }
+    else
+        return QRectF(0, 0, 100, zoneHeight);
 }
 
 void HandZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
@@ -84,31 +78,35 @@ void HandZone::reorganizeCards()
             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);
+            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);
+            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_graphics/zones/hand_zone.h b/cockatrice/src/game/zones/hand_zone.h
similarity index 80%
rename from cockatrice/src/game_graphics/zones/hand_zone.h
rename to cockatrice/src/game/zones/hand_zone.h
index c3f3f252b..25f4148bd 100644
--- a/cockatrice/src/game_graphics/zones/hand_zone.h
+++ b/cockatrice/src/game/zones/hand_zone.h
@@ -1,21 +1,20 @@
 /**
  * @file hand_zone.h
  * @ingroup GameGraphicsZones
- * @brief Graphical zone for the player's hand, supporting horizontal and vertical layouts.
+ * @brief TODO: Document this.
  */
 
 #ifndef HANDZONE_H
 #define HANDZONE_H
 
-#include "../../game/zones/hand_zone_logic.h"
+#include "logic/hand_zone_logic.h"
 #include "select_zone.h"
 
 class HandZone : public SelectZone
 {
     Q_OBJECT
 private:
-    qreal width = 0.0;
-    qreal zoneHeight;
+    qreal width, zoneHeight;
 private slots:
     void updateBg();
 public slots:
diff --git a/cockatrice/src/game/zones/card_zone_algorithms.h b/cockatrice/src/game/zones/logic/card_zone_algorithms.h
similarity index 100%
rename from cockatrice/src/game/zones/card_zone_algorithms.h
rename to cockatrice/src/game/zones/logic/card_zone_algorithms.h
diff --git a/cockatrice/src/game/zones/card_zone_logic.cpp b/cockatrice/src/game/zones/logic/card_zone_logic.cpp
similarity index 91%
rename from cockatrice/src/game/zones/card_zone_logic.cpp
rename to cockatrice/src/game/zones/logic/card_zone_logic.cpp
index 7e0585f4e..e917e4ad7 100644
--- a/cockatrice/src/game/zones/card_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/card_zone_logic.cpp
@@ -1,9 +1,9 @@
 #include "card_zone_logic.h"
 
-#include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/zones/view_zone.h"
-#include "../player/player_actions.h"
-#include "../player/player_logic.h"
+#include "../../board/card_item.h"
+#include "../../player/player.h"
+#include "../../player/player_actions.h"
+#include "../view_zone.h"
 #include "view_zone_logic.h"
 
 #include <QAction>
@@ -20,7 +20,7 @@
  * @param _contentsKnown whether the cards in the zone are known to the client
  * @param parent the parent QObject.
  */
-CardZoneLogic::CardZoneLogic(PlayerLogic *_player,
+CardZoneLogic::CardZoneLogic(Player *_player,
                              const QString &_name,
                              bool _hasCardAttr,
                              bool _isShufflable,
@@ -55,9 +55,8 @@ 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();
 }
@@ -67,19 +66,16 @@ 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);
@@ -146,9 +142,8 @@ 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);
 }
@@ -180,9 +175,9 @@ void CardZoneLogic::clearContents()
 QString CardZoneLogic::getTranslatedName(bool theirOwn, GrammaticalCase gc) const
 {
     QString ownerName = player->getPlayerInfo()->getName();
-    if (name == ZoneNames::HAND) {
+    if (name == ZoneNames::HAND)
         return (theirOwn ? tr("their hand", "nominative") : tr("%1's hand", "nominative").arg(ownerName));
-    } else if (name == ZoneNames::DECK) {
+    else if (name == ZoneNames::DECK)
         switch (gc) {
             case CaseLookAtZone:
                 return (theirOwn ? tr("their library", "look at zone")
@@ -198,11 +193,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 == ZoneNames::GRAVE) {
+    else if (name == ZoneNames::GRAVE)
         return (theirOwn ? tr("their graveyard", "nominative") : tr("%1's graveyard", "nominative").arg(ownerName));
-    } else if (name == ZoneNames::EXILE) {
+    else if (name == ZoneNames::EXILE)
         return (theirOwn ? tr("their exile", "nominative") : tr("%1's exile", "nominative").arg(ownerName));
-    } else if (name == ZoneNames::SIDEBOARD) {
+    else if (name == ZoneNames::SIDEBOARD)
         switch (gc) {
             case CaseLookAtZone:
                 return (theirOwn ? tr("their sideboard", "look at zone")
@@ -213,7 +208,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/card_zone_logic.h b/cockatrice/src/game/zones/logic/card_zone_logic.h
similarity index 91%
rename from cockatrice/src/game/zones/card_zone_logic.h
rename to cockatrice/src/game/zones/logic/card_zone_logic.h
index ae97719a9..1aa46effd 100644
--- a/cockatrice/src/game/zones/card_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/card_zone_logic.h
@@ -1,21 +1,21 @@
 /**
  * @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 <QLoggingCategory>
 #include <QObject>
 
 inline Q_LOGGING_CATEGORY(CardZoneLogicLog, "card_zone_logic");
 
-class PlayerLogic;
+class Player;
 class ZoneViewZone;
 class QMenu;
 class QAction;
@@ -35,7 +35,7 @@ signals:
     void retranslateUi();
 
 public:
-    explicit CardZoneLogic(PlayerLogic *_player,
+    explicit CardZoneLogic(Player *_player,
                            const QString &_name,
                            bool _hasCardAttr,
                            bool _isShufflable,
@@ -68,7 +68,7 @@ public:
         return name;
     }
     [[nodiscard]] QString getTranslatedName(bool theirOwn, GrammaticalCase gc) const;
-    [[nodiscard]] PlayerLogic *getPlayer() const
+    [[nodiscard]] Player *getPlayer() const
     {
         return player;
     }
@@ -105,7 +105,7 @@ private slots:
     void refreshCardInfos();
 
 protected:
-    PlayerLogic *player;
+    Player *player;
     QString name;
     CardList cards;
     QList<ZoneViewZone *> views;
diff --git a/cockatrice/src/game/zones/hand_zone_logic.cpp b/cockatrice/src/game/zones/logic/hand_zone_logic.cpp
similarity index 84%
rename from cockatrice/src/game/zones/hand_zone_logic.cpp
rename to cockatrice/src/game/zones/logic/hand_zone_logic.cpp
index 3bdd15902..efa85d649 100644
--- a/cockatrice/src/game/zones/hand_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/hand_zone_logic.cpp
@@ -1,9 +1,9 @@
 #include "hand_zone_logic.h"
 
-#include "../../game_graphics/board/card_item.h"
+#include "../../board/card_item.h"
 #include "card_zone_algorithms.h"
 
-HandZoneLogic::HandZoneLogic(PlayerLogic *_player,
+HandZoneLogic::HandZoneLogic(Player *_player,
                              const QString &_name,
                              bool _hasCardAttr,
                              bool _isShufflable,
diff --git a/cockatrice/src/game/zones/hand_zone_logic.h b/cockatrice/src/game/zones/logic/hand_zone_logic.h
similarity index 88%
rename from cockatrice/src/game/zones/hand_zone_logic.h
rename to cockatrice/src/game/zones/logic/hand_zone_logic.h
index 400506248..8f34cc851 100644
--- a/cockatrice/src/game/zones/hand_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/hand_zone_logic.h
@@ -1,8 +1,8 @@
 /**
  * @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
@@ -12,7 +12,7 @@ class HandZoneLogic : public CardZoneLogic
 {
     Q_OBJECT
 public:
-    HandZoneLogic(PlayerLogic *_player,
+    HandZoneLogic(Player *_player,
                   const QString &_name,
                   bool _hasCardAttr,
                   bool _isShufflable,
diff --git a/cockatrice/src/game/zones/pile_zone_logic.cpp b/cockatrice/src/game/zones/logic/pile_zone_logic.cpp
similarity index 86%
rename from cockatrice/src/game/zones/pile_zone_logic.cpp
rename to cockatrice/src/game/zones/logic/pile_zone_logic.cpp
index 0f374fb84..c5ffd5fd5 100644
--- a/cockatrice/src/game/zones/pile_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/pile_zone_logic.cpp
@@ -1,8 +1,8 @@
 #include "pile_zone_logic.h"
 
-#include "../../game_graphics/board/card_item.h"
+#include "../../board/card_item.h"
 
-PileZoneLogic::PileZoneLogic(PlayerLogic *_player,
+PileZoneLogic::PileZoneLogic(Player *_player,
                              const QString &_name,
                              bool _hasCardAttr,
                              bool _isShufflable,
@@ -25,9 +25,8 @@ 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/pile_zone_logic.h b/cockatrice/src/game/zones/logic/pile_zone_logic.h
similarity index 89%
rename from cockatrice/src/game/zones/pile_zone_logic.h
rename to cockatrice/src/game/zones/logic/pile_zone_logic.h
index 522d99b89..498d0d4a2 100644
--- a/cockatrice/src/game/zones/pile_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/pile_zone_logic.h
@@ -1,8 +1,8 @@
 /**
  * @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
@@ -17,7 +17,7 @@ signals:
     void callUpdate();
 
 public:
-    PileZoneLogic(PlayerLogic *_player,
+    PileZoneLogic(Player *_player,
                   const QString &_name,
                   bool _hasCardAttr,
                   bool _isShufflable,
diff --git a/cockatrice/src/game/zones/stack_zone_logic.cpp b/cockatrice/src/game/zones/logic/stack_zone_logic.cpp
similarity index 84%
rename from cockatrice/src/game/zones/stack_zone_logic.cpp
rename to cockatrice/src/game/zones/logic/stack_zone_logic.cpp
index 341d4b0e4..6f3cb6e99 100644
--- a/cockatrice/src/game/zones/stack_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/stack_zone_logic.cpp
@@ -1,9 +1,9 @@
 #include "stack_zone_logic.h"
 
-#include "../../game_graphics/board/card_item.h"
+#include "../../board/card_item.h"
 #include "card_zone_algorithms.h"
 
-StackZoneLogic::StackZoneLogic(PlayerLogic *_player,
+StackZoneLogic::StackZoneLogic(Player *_player,
                                const QString &_name,
                                bool _hasCardAttr,
                                bool _isShufflable,
diff --git a/cockatrice/src/game/zones/stack_zone_logic.h b/cockatrice/src/game/zones/logic/stack_zone_logic.h
similarity index 88%
rename from cockatrice/src/game/zones/stack_zone_logic.h
rename to cockatrice/src/game/zones/logic/stack_zone_logic.h
index cce4bd0fa..81b9d6969 100644
--- a/cockatrice/src/game/zones/stack_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/stack_zone_logic.h
@@ -1,8 +1,8 @@
 /**
  * @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
@@ -12,7 +12,7 @@ class StackZoneLogic : public CardZoneLogic
 {
     Q_OBJECT
 public:
-    StackZoneLogic(PlayerLogic *_player,
+    StackZoneLogic(Player *_player,
                    const QString &_name,
                    bool _hasCardAttr,
                    bool _isShufflable,
diff --git a/cockatrice/src/game/zones/table_zone_logic.cpp b/cockatrice/src/game/zones/logic/table_zone_logic.cpp
similarity index 88%
rename from cockatrice/src/game/zones/table_zone_logic.cpp
rename to cockatrice/src/game/zones/logic/table_zone_logic.cpp
index a4f033819..42caf2ec8 100644
--- a/cockatrice/src/game/zones/table_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/table_zone_logic.cpp
@@ -1,8 +1,8 @@
 #include "table_zone_logic.h"
 
-#include "../../game_graphics/board/card_item.h"
+#include "../../board/card_item.h"
 
-TableZoneLogic::TableZoneLogic(PlayerLogic *_player,
+TableZoneLogic::TableZoneLogic(Player *_player,
                                const QString &_name,
                                bool _hasCardAttr,
                                bool _isShufflable,
@@ -29,8 +29,7 @@ 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/table_zone_logic.h b/cockatrice/src/game/zones/logic/table_zone_logic.h
similarity index 93%
rename from cockatrice/src/game/zones/table_zone_logic.h
rename to cockatrice/src/game/zones/logic/table_zone_logic.h
index 6d8d64a20..e173bc637 100644
--- a/cockatrice/src/game/zones/table_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/table_zone_logic.h
@@ -1,8 +1,8 @@
 /**
  * @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
@@ -16,7 +16,7 @@ signals:
     void toggleTapped();
 
 public:
-    TableZoneLogic(PlayerLogic *_player,
+    TableZoneLogic(Player *_player,
                    const QString &_name,
                    bool _hasCardAttr,
                    bool _isShufflable,
diff --git a/cockatrice/src/game/zones/view_zone_logic.cpp b/cockatrice/src/game/zones/logic/view_zone_logic.cpp
similarity index 97%
rename from cockatrice/src/game/zones/view_zone_logic.cpp
rename to cockatrice/src/game/zones/logic/view_zone_logic.cpp
index 8782a1762..5a4db3163 100644
--- a/cockatrice/src/game/zones/view_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/view_zone_logic.cpp
@@ -1,7 +1,7 @@
 #include "view_zone_logic.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "../../game_graphics/board/card_item.h"
+#include "../../../client/settings/cache_settings.h"
+#include "../../board/card_item.h"
 
 /**
  * @param _player the player that the cards are revealed to.
@@ -9,7 +9,7 @@
  * @param _revealZone if false, the cards will be face down.
  * @param _writeableRevealZone whether the player can interact with the revealed cards.
  */
-ZoneViewZoneLogic::ZoneViewZoneLogic(PlayerLogic *_player,
+ZoneViewZoneLogic::ZoneViewZoneLogic(Player *_player,
                                      CardZoneLogic *_origZone,
                                      int _numberCards,
                                      bool _revealZone,
diff --git a/cockatrice/src/game/zones/view_zone_logic.h b/cockatrice/src/game/zones/logic/view_zone_logic.h
similarity index 95%
rename from cockatrice/src/game/zones/view_zone_logic.h
rename to cockatrice/src/game/zones/logic/view_zone_logic.h
index 04ed20e45..6bd5ecc8d 100644
--- a/cockatrice/src/game/zones/view_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/view_zone_logic.h
@@ -1,8 +1,8 @@
 /**
  * @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
@@ -30,7 +30,7 @@ public:
         REMOVE_CARD
     };
 
-    ZoneViewZoneLogic(PlayerLogic *_player,
+    ZoneViewZoneLogic(Player *_player,
                       CardZoneLogic *_origZone,
                       int _numberCards,
                       bool _revealZone,
diff --git a/cockatrice/src/game_graphics/zones/pile_zone.cpp b/cockatrice/src/game/zones/pile_zone.cpp
similarity index 91%
rename from cockatrice/src/game_graphics/zones/pile_zone.cpp
rename to cockatrice/src/game/zones/pile_zone.cpp
index 7bb0e695a..d85b5f4e2 100644
--- a/cockatrice/src/game_graphics/zones/pile_zone.cpp
+++ b/cockatrice/src/game/zones/pile_zone.cpp
@@ -1,10 +1,10 @@
 #include "pile_zone.h"
 
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_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 <QApplication>
@@ -48,10 +48,9 @@ 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(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F);
     painter->rotate(-90);
@@ -88,28 +87,24 @@ 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 forceFaceDown = event->modifiers().testFlag(Qt::ShiftModifier);
     bool bottomCard = event->modifiers().testFlag(Qt::ControlModifier);
@@ -128,8 +123,7 @@ 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_graphics/zones/pile_zone.h b/cockatrice/src/game/zones/pile_zone.h
similarity index 93%
rename from cockatrice/src/game_graphics/zones/pile_zone.h
rename to cockatrice/src/game/zones/pile_zone.h
index 099bc6f60..5bfc50880 100644
--- a/cockatrice/src/game_graphics/zones/pile_zone.h
+++ b/cockatrice/src/game/zones/pile_zone.h
@@ -1,14 +1,14 @@
 /**
  * @file pile_zone.h
  * @ingroup GameGraphicsZones
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef PILEZONE_H
 #define PILEZONE_H
 
-#include "../../game/zones/pile_zone_logic.h"
 #include "card_zone.h"
+#include "logic/pile_zone_logic.h"
 
 /**
  * A CardZone where the cards are in a single pile instead of being laid out.
diff --git a/cockatrice/src/game/zones/select_zone.cpp b/cockatrice/src/game/zones/select_zone.cpp
new file mode 100644
index 000000000..9bf5f9faf
--- /dev/null
+++ b/cockatrice/src/game/zones/select_zone.cpp
@@ -0,0 +1,97 @@
+#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),
+            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/zones/select_zone.h b/cockatrice/src/game/zones/select_zone.h
new file mode 100644
index 000000000..d6fd3e10e
--- /dev/null
+++ b/cockatrice/src/game/zones/select_zone.h
@@ -0,0 +1,35 @@
+/**
+ * @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
new file mode 100644
index 000000000..a9d649a4a
--- /dev/null
+++ b/cockatrice/src/game/zones/stack_zone.cpp
@@ -0,0 +1,112 @@
+#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) {
+            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::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_graphics/zones/stack_zone.h b/cockatrice/src/game/zones/stack_zone.h
similarity index 71%
rename from cockatrice/src/game_graphics/zones/stack_zone.h
rename to cockatrice/src/game/zones/stack_zone.h
index 147c3e2fc..7c98f5128 100644
--- a/cockatrice/src/game_graphics/zones/stack_zone.h
+++ b/cockatrice/src/game/zones/stack_zone.h
@@ -1,13 +1,13 @@
 /**
  * @file stack_zone.h
  * @ingroup GameGraphicsZones
- * @brief Graphical zone for the stack, displaying cards in a vertical pile.
+ * @brief TODO: Document this.
  */
 
 #ifndef STACKZONE_H
 #define STACKZONE_H
 
-#include "../../game/zones/stack_zone_logic.h"
+#include "logic/stack_zone_logic.h"
 #include "select_zone.h"
 
 class StackZone : public SelectZone
@@ -20,8 +20,6 @@ private slots:
 
 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_graphics/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp
similarity index 89%
rename from cockatrice/src/game_graphics/zones/table_zone.cpp
rename to cockatrice/src/game/zones/table_zone.cpp
index e886f62e9..b6ac2150b 100644
--- a/cockatrice/src/game_graphics/zones/table_zone.cpp
+++ b/cockatrice/src/game/zones/table_zone.cpp
@@ -1,14 +1,14 @@
 #include "table_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/table_zone_logic.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 "../z_values.h"
+#include "logic/table_zone_logic.h"
 
 #include <QGraphicsScene>
 #include <QPainter>
@@ -22,8 +22,7 @@ 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, bool _mirrored, QGraphicsItem *parent)
-    : SelectZone(_logic, parent), active(false), mirrored(_mirrored)
+TableZone::TableZone(TableZoneLogic *_logic, QGraphicsItem *parent) : SelectZone(_logic, parent), active(false)
 {
     connect(_logic, &TableZoneLogic::contentSizeChanged, this, &TableZone::resizeToContents);
     connect(_logic, &TableZoneLogic::toggleTapped, this, &TableZone::toggleTapped);
@@ -51,16 +50,12 @@ QRectF TableZone::boundingRect() const
     return QRectF(0, 0, width, height);
 }
 
-void TableZone::setMirrored(bool isMirrored)
-{
-    mirrored = isMirrored;
-    update();
-}
-
 bool TableZone::isInverted() const
 {
-    return ((mirrored && !SettingsCache::instance().getInvertVerticalCoordinate()) ||
-            (!mirrored && SettingsCache::instance().getInvertVerticalCoordinate()));
+    return ((getLogic()->getPlayer()->getGraphicsItem()->getMirrored() &&
+             !SettingsCache::instance().getInvertVerticalCoordinate()) ||
+            (!getLogic()->getPlayer()->getGraphicsItem()->getMirrored() &&
+             SettingsCache::instance().getInvertVerticalCoordinate()));
 }
 
 void TableZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
@@ -113,9 +108,8 @@ 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 * (CardDimensions::HEIGHT + PADDING_Y) - STACKED_CARD_OFFSET_Y / 2;
-    if (isInverted()) {
+    if (isInverted())
         separatorY = height - separatorY;
-    }
     painter->setPen(QColor(255, 255, 255, 40));
     painter->drawLine(QPointF(0, separatorY), QPointF(width, separatorY));
 }
@@ -163,9 +157,8 @@ 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();
@@ -174,9 +167,8 @@ 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(ZValues::tableCardZValue(actualX, actualY));
@@ -235,19 +227,16 @@ 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 * CardDimensions::WIDTH) + PADDING_X + MARGIN_RIGHT;
 
-    if (currentMinimumWidth < MIN_WIDTH) {
+    if (currentMinimumWidth < MIN_WIDTH)
         currentMinimumWidth = MIN_WIDTH;
-    }
 
     if (currentMinimumWidth != width) {
         prepareGeometryChange();
@@ -258,11 +247,9 @@ 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;
 }
 
@@ -279,9 +266,8 @@ 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);
@@ -291,18 +277,16 @@ 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) {
+        if (stackCount == 1)
             cardStackWidth.insert(key, CardDimensions::WIDTH + getLogic()->getCards()[i]->getAttachedCards().size() *
                                                                    STACKED_CARD_OFFSET_X);
-        } else {
+        else
             cardStackWidth.insert(key, CardDimensions::WIDTH + (stackCount - 1) * STACKED_CARD_OFFSET_X);
-        }
     }
 }
 
@@ -319,17 +303,15 @@ QPointF TableZone::mapFromGrid(QPoint gridPoint) const
         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) {
+    for (int i = 0; i < gridPoint.y(); ++i)
         y += CardDimensions::HEIGHT + PADDING_Y;
-    }
 
     return QPointF(x, y);
 }
@@ -348,9 +330,8 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const
 
     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.
@@ -386,30 +367,18 @@ 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_graphics/zones/table_zone.h b/cockatrice/src/game/zones/table_zone.h
similarity index 86%
rename from cockatrice/src/game_graphics/zones/table_zone.h
rename to cockatrice/src/game/zones/table_zone.h
index 0d7e58206..61eb48d7b 100644
--- a/cockatrice/src/game_graphics/zones/table_zone.h
+++ b/cockatrice/src/game/zones/table_zone.h
@@ -1,22 +1,23 @@
 /**
  * @file table_zone.h
  * @ingroup GameGraphicsZones
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TABLEZONE_H
 #define TABLEZONE_H
 
-#include "../../game/zones/table_zone_logic.h"
 #include "../board/abstract_card_item.h"
+#include "logic/table_zone_logic.h"
 #include "select_zone.h"
 
-/**
- * @brief TableZone is the grid based rect where CardItems may be placed.
- *
+/*
+ * TableZone is the grid based rect where CardItems may be placed.
  * It is the main play zone and can be customized with background images.
+ *
+ * TODO: Refactor methods to make more readable, extract some logic to
+ * private methods (Im looking at you TableZone::reorganizeCards())
  */
-//! \todo Refactor methods to make more readable, extract logic to private methods (especially reorganizeCards()).
 class TableZone : public SelectZone
 {
     Q_OBJECT
@@ -82,7 +83,6 @@ private:
        If this TableZone is currently active
      */
     bool active = false;
-    bool mirrored = false;
 
     [[nodiscard]] bool isInverted() const;
 
@@ -97,7 +97,6 @@ public slots:
        Reorganizes CardItems in the TableZone
      */
     void reorganizeCards() override;
-    void setMirrored(bool isMirrored);
 
 public:
     /**
@@ -106,7 +105,7 @@ public:
        @param _p the Player
        @param parent defaults to null
      */
-    explicit TableZone(TableZoneLogic *_logic, bool mirrored, QGraphicsItem *parent = nullptr);
+    explicit TableZone(TableZoneLogic *_logic, QGraphicsItem *parent = nullptr);
 
     /**
        @return a QRectF of the TableZone bounding box.
@@ -152,13 +151,6 @@ 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.
diff --git a/cockatrice/src/game_graphics/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp
similarity index 97%
rename from cockatrice/src/game_graphics/zones/view_zone.cpp
rename to cockatrice/src/game/zones/view_zone.cpp
index baf7b8b30..d2fd1e971 100644
--- a/cockatrice/src/game_graphics/zones/view_zone.cpp
+++ b/cockatrice/src/game/zones/view_zone.cpp
@@ -1,10 +1,10 @@
 #include "view_zone.h"
 
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_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 <QBrush>
 #include <QDebug>
@@ -203,9 +203,9 @@ 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;
                 }
@@ -233,9 +233,8 @@ 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;
 
diff --git a/cockatrice/src/game_graphics/zones/view_zone.h b/cockatrice/src/game/zones/view_zone.h
similarity index 97%
rename from cockatrice/src/game_graphics/zones/view_zone.h
rename to cockatrice/src/game/zones/view_zone.h
index 9dfa00ce2..81279c72e 100644
--- a/cockatrice/src/game_graphics/zones/view_zone.h
+++ b/cockatrice/src/game/zones/view_zone.h
@@ -1,13 +1,13 @@
 /**
  * @file view_zone.h
  * @ingroup GameGraphicsZones
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef ZONEVIEWERZONE_H
 #define ZONEVIEWERZONE_H
 
-#include "../../game/zones/view_zone_logic.h"
+#include "logic/view_zone_logic.h"
 #include "select_zone.h"
 
 #include <QGraphicsLayoutItem>
diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp
similarity index 98%
rename from cockatrice/src/game_graphics/zones/view_zone_widget.cpp
rename to cockatrice/src/game/zones/view_zone_widget.cpp
index 4a5d064d0..23d7d6a19 100644
--- a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
+++ b/cockatrice/src/game/zones/view_zone_widget.cpp
@@ -2,11 +2,11 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../filters/syntax_help.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_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 "../z_values.h"
 #include "view_zone.h"
 
@@ -37,7 +37,7 @@ constexpr qreal kMinVisibleWidth = 100.0;
  * @param _revealZone if false, the cards will be face down.
  * @param _writeableRevealZone whether the player can interact with the revealed cards.
  */
-ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player,
+ZoneViewWidget::ZoneViewWidget(Player *_player,
                                CardZoneLogic *_origZone,
                                int numberCards,
                                bool _revealZone,
@@ -252,9 +252,8 @@ void ZoneViewWidget::retranslateUi()
 
 void ZoneViewWidget::stopWindowDrag()
 {
-    if (!draggingWindow) {
+    if (!draggingWindow)
         return;
-    }
 
     draggingWindow = false;
     ungrabMouse();
@@ -313,15 +312,13 @@ QGraphicsView *ZoneViewWidget::findDragView(QWidget *eventWidget) const
 {
     QWidget *current = eventWidget;
     while (current) {
-        if (auto *view = qobject_cast<QGraphicsView *>(current)) {
+        if (auto *view = qobject_cast<QGraphicsView *>(current))
             return view;
-        }
         current = current->parentWidget();
     }
 
-    if (scene() && !scene()->views().isEmpty()) {
+    if (scene() && !scene()->views().isEmpty())
         return scene()->views().constFirst();
-    }
 
     return nullptr;
 }
@@ -349,9 +346,8 @@ bool ZoneViewWidget::windowFrameEvent(QEvent *event)
     }
 
     auto *me = dynamic_cast<QGraphicsSceneMouseEvent *>(event);
-    if (!me) {
+    if (!me)
         return QGraphicsWidget::windowFrameEvent(event);
-    }
 
     switch (event->type()) {
         case QEvent::GraphicsSceneMousePress:
@@ -510,9 +506,8 @@ 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)
@@ -526,9 +521,8 @@ void ZoneViewWidget::closeEvent(QCloseEvent *event)
     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();
 }
@@ -542,9 +536,8 @@ void ZoneViewWidget::zoneDeleted()
 void ZoneViewWidget::initStyleOption(QStyleOption *option) const
 {
     QStyleOptionTitleBar *titleBar = qstyleoption_cast<QStyleOptionTitleBar *>(option);
-    if (titleBar) {
+    if (titleBar)
         titleBar->icon = QPixmap("theme:cockatrice");
-    }
 }
 
 /**
diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.h b/cockatrice/src/game/zones/view_zone_widget.h
similarity index 95%
rename from cockatrice/src/game_graphics/zones/view_zone_widget.h
rename to cockatrice/src/game/zones/view_zone_widget.h
index de5ad28d5..1246192b8 100644
--- a/cockatrice/src/game_graphics/zones/view_zone_widget.h
+++ b/cockatrice/src/game/zones/view_zone_widget.h
@@ -1,12 +1,12 @@
 /**
  * @file view_zone_widget.h
  * @ingroup GameGraphicsZones
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 #ifndef ZONEVIEWWIDGET_H
 #define ZONEVIEWWIDGET_H
 
-#include "../../game/zones/card_zone_logic.h"
+#include "logic/card_zone_logic.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -20,7 +20,7 @@ class QLabel;
 class QPushButton;
 class CardZone;
 class ZoneViewZone;
-class PlayerLogic;
+class Player;
 class CardDatabase;
 class QScrollBar;
 class GameScene;
@@ -65,7 +65,7 @@ private:
 
     bool canBeShuffled;
     int extraHeight;
-    PlayerLogic *player;
+    Player *player;
 
     bool draggingWindow = false;
     QPoint dragStartScreenPos;
@@ -108,7 +108,7 @@ private slots:
     void expandWindow();
 
 public:
-    ZoneViewWidget(PlayerLogic *_player,
+    ZoneViewWidget(Player *_player,
                    CardZoneLogic *_origZone,
                    int numberCards = 0,
                    bool _revealZone = false,
@@ -119,7 +119,7 @@ public:
     {
         return zone;
     }
-    PlayerLogic *getPlayer() const
+    Player *getPlayer() const
     {
         return player;
     }
diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
index 8da8ab708..05f4a41ab 100644
--- a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
@@ -19,29 +19,27 @@ void AbstractGraphicsItem::paintNumberEllipse(int number,
     QFontMetrics fm(font);
     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 287c2c0b3..93b9bff1b 100644
--- a/cockatrice/src/game_graphics/board/abstract_graphics_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.h
@@ -1,8 +1,8 @@
 /**
  * @file abstract_graphics_item.h
  * @ingroup GameGraphics
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef ABSTRACTGRAPHICSITEM_H
 #define ABSTRACTGRAPHICSITEM_H
diff --git a/cockatrice/src/game_graphics/board/arrow_target.cpp b/cockatrice/src/game_graphics/board/arrow_target.cpp
deleted file mode 100644
index 79b21d921..000000000
--- a/cockatrice/src/game_graphics/board/arrow_target.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "arrow_target.h"
-
-#include "../../game/player/player_logic.h"
-#include "arrow_item.h"
-
-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
deleted file mode 100644
index bf89c5456..000000000
--- a/cockatrice/src/game_graphics/board/arrow_target.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @file arrow_target.h
- * @ingroup GameGraphics
- */
-//! \todo Document this file.
-
-#ifndef ARROWTARGET_H
-#define ARROWTARGET_H
-
-#include "abstract_graphics_item.h"
-
-#include <QList>
-
-class PlayerLogic;
-class ArrowItem;
-
-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_graphics/board/graphics_item_type.h b/cockatrice/src/game_graphics/board/graphics_item_type.h
index 7eac132b0..c48ae4ed6 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
diff --git a/cockatrice/src/game_graphics/log/message_log_widget.h b/cockatrice/src/game_graphics/log/message_log_widget.h
deleted file mode 100644
index a145d358d..000000000
--- a/cockatrice/src/game_graphics/log/message_log_widget.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * @file message_log_widget.h
- * @ingroup GameWidgets
- */
-//! \todo Document this file.
-
-#ifndef MESSAGELOGWIDGET_H
-#define MESSAGELOGWIDGET_H
-
-#include "../../game/zones/card_zone_logic.h"
-#include "../../interface/widgets/server/chat_view/chat_view.h"
-
-class AbstractGame;
-class CardItem;
-class GameEventContext;
-class PlayerLogic;
-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(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;
-};
-
-#endif
diff --git a/cockatrice/src/game_graphics/player/menu/abstract_player_component.h b/cockatrice/src/game_graphics/player/menu/abstract_player_component.h
deleted file mode 100644
index ee310c428..000000000
--- a/cockatrice/src/game_graphics/player/menu/abstract_player_component.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @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_graphics/player/menu/custom_zone_menu.h b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
deleted file mode 100644
index 46dd58db6..000000000
--- a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @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>
-
-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_graphics/player/menu/player_menu.cpp b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
deleted file mode 100644
index 17b791222..000000000
--- a/cockatrice/src/game_graphics/player/menu/player_menu.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-#include "player_menu.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/tabs/tab_game.h"
-#include "../../board/card_item.h"
-#include "../player_graphics_item.h"
-#include "card_menu.h"
-#include "hand_menu.h"
-
-#include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
-
-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;
-    }
-
-    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
deleted file mode 100644
index 62ba66df7..000000000
--- a/cockatrice/src/game_graphics/player/menu/player_menu.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * @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 "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 <QList>
-#include <QMenu>
-#include <QObject>
-
-class CardItem;
-class CardMenu;
-class PlayerGraphicsItem;
-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;
-    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/say_menu.cpp b/cockatrice/src/game_graphics/player/menu/say_menu.cpp
deleted file mode 100644
index 336b70f0d..000000000
--- a/cockatrice/src/game_graphics/player/menu/say_menu.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#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"
-
-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
deleted file mode 100644
index 3ff160d05..000000000
--- a/cockatrice/src/game_graphics/player/menu/say_menu.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @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>
-
-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.h b/cockatrice/src/game_graphics/player/menu/sideboard_menu.h
deleted file mode 100644
index b3b547291..000000000
--- a/cockatrice/src/game_graphics/player/menu/sideboard_menu.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @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>
-
-class PlayerGraphicsItem;
-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/player_dialogs.cpp b/cockatrice/src/game_graphics/player/player_dialogs.cpp
deleted file mode 100644
index 3c26ae1fe..000000000
--- a/cockatrice/src/game_graphics/player/player_dialogs.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-#include "player_dialogs.h"
-
-#include "../../client/settings/card_counter_settings.h"
-#include "../../interface/widgets/utility/get_text_with_max.h"
-#include "../board/card_item.h"
-#include "../dialogs/dlg_roll_dice.h"
-#include "../player/player_graphics_item.h"
-
-#include <QInputDialog>
-#include <libcockatrice/card/relation/card_relation.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
deleted file mode 100644
index f87704f2d..000000000
--- a/cockatrice/src/game_graphics/player/player_dialogs.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef COCKATRICE_PLAYER_DIALOGS_H
-#define COCKATRICE_PLAYER_DIALOGS_H
-#include "../../game/player/player_actions.h"
-#include "player_graphics_item.h"
-
-#include <QGraphicsView>
-#include <QObject>
-
-class PlayerGraphicsItem;
-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/zones/select_zone.cpp b/cockatrice/src/game_graphics/zones/select_zone.cpp
deleted file mode 100644
index f2e720686..000000000
--- a/cockatrice/src/game_graphics/zones/select_zone.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-#include "select_zone.h"
-
-#include "../../client/settings/cache_settings.h"
-#include "../board/card_item.h"
-#include "../game_scene.h"
-
-#include <QGraphicsRectItem>
-#include <QGraphicsSceneMouseEvent>
-#include <QtMath>
-
-static qreal stackingOffset(qreal cardHeight)
-{
-    const qreal overlapPercent = SettingsCache::instance().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 fitOffset;
-        if (params.totalHeight < params.cardHeight && params.minOffset > 0.0) {
-            // Zone is shorter than a card (e.g. minimized). Compress offsets so
-            // every card has at least minOffset pixels of its top visible.
-            fitOffset = (params.totalHeight - params.minOffset) / (params.cardCount - 1);
-            effectiveOffset = qMax(0.0, qMin(params.desiredOffset, fitOffset));
-        } else {
-            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;
-            }
-            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, 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;
-    }
-    return qBound(0, qRound((dropY - start) / effectiveOffset), params.cardCount - 1);
-}
-
-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
deleted file mode 100644
index 7408f29b6..000000000
--- a/cockatrice/src/game_graphics/zones/select_zone.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * @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 <QSet>
-#include <optional>
-
-class QGraphicsRectItem;
-
-/**
- * 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.
-     */
-    int calcDropIndexFromY(qreal dropY, 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
deleted file mode 100644
index 46ff099ab..000000000
--- a/cockatrice/src/game_graphics/zones/stack_zone.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include "stack_zone.h"
-
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_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 <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, CardDimensions::WIDTH_F * 1.5, 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 || dragItems.isEmpty()) {
-        return;
-    }
-
-    int index = calcDropIndexFromY(dropPoint.y(), MIN_CARD_VISIBLE);
-
-    // Same-zone no-op: don't move a card onto itself
-    const auto &cards = getLogic()->getCards();
-    if (!cards.isEmpty() && startZone == getLogic() && 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/interface/card_picture_loader/card_picture_loader.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
index bd427a6c8..06a0476c9 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
@@ -28,7 +28,6 @@ CardPictureLoader::CardPictureLoader() : QObject(nullptr)
     connect(&SettingsCache::instance(), &SettingsCache::picDownloadChanged, this,
             &CardPictureLoader::picDownloadChanged);
 
-    qRegisterMetaType<ExactCard>();
     connect(worker, &CardPictureLoaderWorker::imageLoaded, this, &CardPictureLoader::imageLoaded);
 
     statusBar = new CardPictureLoaderStatusBar(nullptr);
@@ -150,10 +149,9 @@ void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize
 
 void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image)
 {
-    QPixmap finalPixmap;
-
     if (image.isNull()) {
         qCDebug(CardPictureLoaderLog) << "Caching NULL pixmap for" << card.getName();
+        QPixmapCache::insert(card.getPixmapCacheKey(), QPixmap());
     } else {
         if (card.getInfo().getUiAttributes().upsideDownArt) {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0))
@@ -161,19 +159,12 @@ void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image)
 #else
             QImage mirrorImage = image.mirrored(true, true);
 #endif
-            finalPixmap = QPixmap::fromImage(mirrorImage);
+            QPixmapCache::insert(card.getPixmapCacheKey(), QPixmap::fromImage(mirrorImage));
         } else {
-            finalPixmap = QPixmap::fromImage(image);
+            QPixmapCache::insert(card.getPixmapCacheKey(), QPixmap::fromImage(image));
         }
     }
 
-    QPixmapCache::insert(card.getPixmapCacheKey(), finalPixmap);
-
-    if (SettingsCache::instance().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.
@@ -183,88 +174,6 @@ void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image)
     card.emitPixmapUpdated();
 }
 
-void CardPictureLoader::saveCardImageToLocalStorage(const ExactCard &card, const QPixmap &pixmap)
-{
-    if (pixmap.isNull() || !card) {
-        return;
-    }
-
-    const QString picsRoot = SettingsCache::instance().getPicsPath();
-    CardPictureLoaderLocalSchemes::NamingScheme scheme =
-        SettingsCache::instance().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));
-
-    // Do not overwrite existing files
-    if (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::clearPixmapCache()
 {
     QPixmapCache::clear();
@@ -320,9 +229,8 @@ bool CardPictureLoader::hasCustomArt()
         QFileInfo dir(it.next());
 #endif
 
-        if (it.fileName() == "downloadedPics") {
+        if (it.fileName() == "downloadedPics")
             continue;
-        }
 
         QDirIterator subIt(it.filePath(), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
         if (subIt.hasNext()) {
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 0c114ae92..4000fd99a 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
@@ -117,7 +117,6 @@ public slots:
      * @param image Loaded QImage.
      */
     void imageLoaded(const ExactCard &card, const QImage &image);
-    void saveCardImageToLocalStorage(const ExactCard &card, const QPixmap &pixmap);
 
 private slots:
     /**
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
deleted file mode 100644
index 54977e249..000000000
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_cache_method.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#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 bb10d1c42..dd00e6e1d 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,7 +1,6 @@
 #include "card_picture_loader_local.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "card_picture_loader_local_schemes.h"
 #include "card_picture_to_load.h"
 
 #include <QDirIterator>
@@ -78,8 +77,26 @@ QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
     imgReader.setDecideFormatFromContent(true);
 
     // Most-to-least specific, these will fall through in order.
-    QStringList nameVariants =
-        CardPictureLoaderLocalSchemes::generateImportVariants(correctedCardName, setName, collectorNumber, providerId);
+    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;
 
     for (const QString &nameVariant : nameVariants) {
         if (nameVariant.isEmpty()) {
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
deleted file mode 100644
index d51d646e6..000000000
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local_schemes.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#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_worker.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
index 2f51ba986..a246d74f2 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
@@ -26,15 +26,10 @@ CardPictureLoaderWorker::CardPictureLoaderWorker()
     cache->setCacheDirectory(SettingsCache::instance().getNetworkCachePath());
     cache->setMaximumCacheSize(1024L * 1024L *
                                static_cast<qint64>(SettingsCache::instance().getNetworkCacheSizeInMB()));
-
-    connect(&SettingsCache::instance(), &SettingsCache::networkCacheSizeChanged, cache, [this](int newSizeInMB) {
-        if (cache) {
-            cache->setMaximumCacheSize(1024L * 1024L * static_cast<qint64>(newSizeInMB));
-        }
-    });
-
+    // 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)); });
     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);
@@ -70,19 +65,14 @@ void CardPictureLoaderWorker::queueRequest(const QUrl &url, CardPictureLoaderWor
     QUrl cachedRedirect = getCachedRedirect(url);
     if (!cachedRedirect.isEmpty()) {
         queueRequest(cachedRedirect, worker);
-        return;
-    }
-    if (SettingsCache::instance().getCardPictureLoaderCacheMethod() ==
-            CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE &&
-        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
+    } 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);
-        return;
+    } else {
+        requestLoadQueue.append(qMakePair(url, worker));
+        emit imageRequestQueued(url, worker->cardToDownload.getCard(), worker->cardToDownload.getSetName());
+        processQueuedRequests();
     }
-    requestLoadQueue.append(qMakePair(url, worker));
-    emit imageRequestQueued(url, worker->cardToDownload.getCard(), worker->cardToDownload.getSetName());
-    processQueuedRequests();
 }
 
 QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker)
@@ -97,12 +87,9 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture
     QNetworkRequest req(url);
     req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     req.setRawHeader("Accept", "image/avif,image/webp,image/apng,image/,/*;q=0.8");
-
-    bool useNetworkCache = !picDownload && SettingsCache::instance().getCardPictureLoaderCacheMethod() ==
-                                               CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE;
-
-    req.setAttribute(QNetworkRequest::CacheLoadControlAttribute,
-                     useNetworkCache ? QNetworkRequest::AlwaysCache : QNetworkRequest::AlwaysNetwork);
+    if (!picDownload) {
+        req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
+    }
 
     QNetworkReply *reply = networkManager->get(req);
 
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 63846e5fd..d72226aab 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
@@ -53,19 +53,18 @@ 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()) {
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp
index 39a0c1071..d71dca24a 100644
--- a/cockatrice/src/interface/deck_loader/deck_loader.cpp
+++ b/cockatrice/src/interface/deck_loader/deck_loader.cpp
@@ -9,7 +9,6 @@
 #include <QFutureWatcher>
 #include <QPrinter>
 #include <QRegularExpression>
-#include <QSaveFile>
 #include <QStringList>
 #include <QTextCursor>
 #include <QTextDocument>
@@ -130,10 +129,7 @@ std::optional<LoadedDeck> DeckLoader::loadFromRemote(const QString &nativeString
 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);
+    QFile file(fileName);
     if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         qCWarning(DeckLoaderLog) << "Could not create or open file:" << fileName;
         return std::nullopt;
@@ -149,19 +145,15 @@ DeckLoader::saveToFile(const DeckList &deck, const QString &fileName, DeckFileFo
             break;
     }
 
+    file.flush();
+    file.close();
+
+    qCInfo(DeckLoaderLog) << "Saved deck to " << fileName << "with format" << fmt << "-" << success;
+
     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;
 }
@@ -189,11 +181,6 @@ bool DeckLoader::saveToNewFile(LoadedDeck &deck, const QString &fileName, DeckFi
  */
 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);
@@ -204,44 +191,45 @@ bool DeckLoader::updateLastLoadedTimestamp(LoadedDeck &deck)
 
     QDateTime originalTimestamp = fileInfo.lastModified();
 
-    // 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);
+    // Open the file for writing
+    QFile 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
-    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;
+    switch (deck.lastLoadInfo.fileFormat) {
+        case DeckFileFormat::PlainText:
+            result = deck.deckList.saveToFile_Plain(&file);
+            break;
+        case DeckFileFormat::Cockatrice:
+            deck.deckList.setLastLoadedTimestamp(QDateTime::currentDateTime().toString());
+            result = deck.deckList.saveToFile_Native(&file);
+            break;
     }
 
-    if (!file.commit()) {
-        qCWarning(DeckLoaderLog) << "Failed to update timestamp for file:" << fileName << ":" << file.errorString();
-        return false;
+    file.close(); // Close the file to ensure changes are flushed
+
+    if (result) {
+        // 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();
     }
 
-    // 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;
+    return result;
 }
 
 static QString getDomainForWebsite(DeckLoader::DecklistWebsite website)
@@ -441,7 +429,8 @@ 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();
@@ -458,54 +447,51 @@ bool DeckLoader::convertToCockatriceFormat(LoadedDeck &deck)
         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");
 
-    // 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);
+    // Open the new file for writing
+    QFile file(newFileName);
     if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         qCWarning(DeckLoaderLog) << "Failed to open file for writing:" << newFileName;
         return false;
     }
 
-    if (!deck.deckList.saveToFile_Native(&file)) {
-        file.cancelWriting();
-        qCWarning(DeckLoaderLog) << "Failed to serialize deck for file:" << newFileName;
-        return false;
+    bool result = false;
+
+    // Perform file modifications based on the detected format
+    switch (DeckFileFormat::getFormatFromName(fileName)) {
+        case DeckFileFormat::PlainText:
+            // Save in Cockatrice's native format
+            result = deck.deckList.saveToFile_Native(&file);
+            break;
+        case DeckFileFormat::Cockatrice:
+            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 (!file.commit()) {
-        qCWarning(DeckLoaderLog) << "Failed to convert deck to " << newFileName << ":" << file.errorString();
-        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;
+        }
+        deck.lastLoadInfo = {
+            .fileName = newFileName,
+            .fileFormat = DeckFileFormat::Cockatrice,
+        };
     }
 
-    // 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;
+    return result;
 }
 
 void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node)
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h
index ac23e1ee0..2530b7f5d 100644
--- a/cockatrice/src/interface/deck_loader/deck_loader.h
+++ b/cockatrice/src/interface/deck_loader/deck_loader.h
@@ -1,8 +1,8 @@
 /**
  * @file deck_loader.h
  * @ingroup ImportExport
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DECK_LOADER_H
 #define DECK_LOADER_H
@@ -13,7 +13,6 @@
 #include <QPrinter>
 #include <QTextCursor>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <optional>
 
 inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader");
 
diff --git a/cockatrice/src/interface/key_signals.cpp b/cockatrice/src/interface/key_signals.cpp
index a78997cc2..b4a38fad5 100644
--- a/cockatrice/src/interface/key_signals.cpp
+++ b/cockatrice/src/interface/key_signals.cpp
@@ -6,33 +6,29 @@ 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:
@@ -41,39 +37,33 @@ 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 30dcee0ba..3404dca9e 100644
--- a/cockatrice/src/interface/key_signals.h
+++ b/cockatrice/src/interface/key_signals.h
@@ -2,8 +2,8 @@
  * @file key_signals.h
  * @ingroup Core
  * @ingroup UI
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef KEYSIGNALS_H
 #define KEYSIGNALS_H
diff --git a/cockatrice/src/interface/layouts/flow_layout.cpp b/cockatrice/src/interface/layouts/flow_layout.cpp
index 0d03b7789..f7ebbfb79 100644
--- a/cockatrice/src/interface/layouts/flow_layout.cpp
+++ b/cockatrice/src/interface/layouts/flow_layout.cpp
@@ -1,16 +1,7 @@
 /**
  * @file flow_layout.cpp
- * @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.
+ * @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.
  */
 
 #include "flow_layout.h"
@@ -21,18 +12,27 @@
 #include <QLayoutItem>
 #include <QScrollArea>
 #include <QStyle>
-#include <QWidgetItem>
 
+/**
+ * @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,353 +42,499 @@ FlowLayout::~FlowLayout()
 }
 
 /**
- * @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.
+ * @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.
  */
 Qt::Orientations FlowLayout::expandingDirections() const
 {
-    return (flowDirection == Qt::Horizontal) ? Qt::Horizontal : Qt::Vertical;
+    return Qt::Horizontal | Qt::Vertical;
 }
 
 /**
- * @brief Height-for-width is only meaningful for horizontal (wrapping) flow.
+ * @brief Indicates that this layout's height depends on its width.
+ * @return True, as the layout adjusts its height to fit the specified width.
  */
 bool FlowLayout::hasHeightForWidth() const
 {
-    return flowDirection == Qt::Horizontal;
+    return true;
 }
 
 /**
- * @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.
+ * @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.
  */
 int FlowLayout::heightForWidth(const int width) const
 {
-    if (flowDirection != Qt::Horizontal) {
-        return -1;
-    }
+    if (flowDirection == Qt::Vertical) {
+        int height = 0;
+        int rowWidth = 0;
+        int rowHeight = 0;
 
-    int totalHeight = 0;
-    int rowUsedWidth = 0;
-    int rowHeight = 0;
+        for (const QLayoutItem *item : items) {
+            if (item == nullptr || item->isEmpty()) {
+                continue;
+            }
 
-    for (const QLayoutItem *item : items) {
-        if (!item || 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;
 
-        const QSize itemSize = item->sizeHint();
-        // Spacing is only inserted between items, not before the first.
-        const int spaceX = (rowUsedWidth > 0) ? horizontalSpacing() : 0;
+        for (const QLayoutItem *item : items) {
+            if (item == nullptr || item->isEmpty()) {
+                continue;
+            }
 
-        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());
+            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;
     }
-
-    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.
+ * @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);
+    QLayout::setGeometry(rect); // Sets the geometry of the layout based on the given rectangle.
 
     if (flowDirection == Qt::Horizontal) {
-        layoutAllRows(rect.x(), rect.y(), rect.width());
+        // 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 {
-        layoutAllColumns(rect.x(), rect.y(), rect.height());
+        const int availableHeight = qMax(rect.height(), getParentScrollAreaHeight());
+
+        const int totalWidth = layoutAllColumns(rect.x(), rect.y(), availableHeight);
+
+        if (QWidget *parentWidgetPtr = parentWidget()) {
+            parentWidgetPtr->setFixedSize(totalWidth, availableHeight);
+        }
     }
 }
 
-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.
+ * @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;
-    int rowUsedWidth = 0; // Width consumed by items already in the current row.
-    int currentY = originY;
-    int rowHeight = 0;
+    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 || item->isEmpty()) {
+        if (item == nullptr || 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();
+        QSize itemSize = item->sizeHint();                      // The suggested size for the current item
+        int itemWidth = itemSize.width() + horizontalSpacing(); // Item width plus spacing
 
-        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;
+        // 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
         }
 
         // Add the item to the current row
         rowItems.append(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());
+        rowHeight = qMax(rowHeight, itemSize.height());      // Update the row's height to the tallest item
+        currentXPosition += itemWidth + horizontalSpacing(); // Move x-position for the next item
     }
 
-    layoutSingleRow(rowItems, originX, currentY, availableWidth); // Flush the final row.
-    return currentY + rowHeight;
+    // 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;
 }
 
 /**
- * @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.
+ * @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.
  */
-void FlowLayout::layoutSingleRow(const QVector<QLayoutItem *> &rowItems, int x, const int y, const int availableWidth)
+void FlowLayout::layoutSingleRow(const QVector<QLayoutItem *> &rowItems, int x, const int y)
 {
-    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 || item->isEmpty()) {
+        if (item == nullptr || item->isEmpty()) {
             continue;
         }
 
-        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());
-
+        // 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
         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 Places all items into wrapping columns within @p availableHeight.
- * @return The x-coordinate of the right edge of the last column.
+ * @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.
  */
 int FlowLayout::layoutAllColumns(const int originX, const int originY, const int availableHeight)
 {
-    QVector<QLayoutItem *> colItems;
-    int colUsedHeight = 0; // Height consumed by items already in the current column.
-    int currentX = originX;
-    int colWidth = 0;
+    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
 
     for (QLayoutItem *item : items) {
-        if (!item || item->isEmpty()) {
+        if (item == nullptr || item->isEmpty()) {
             continue;
         }
 
-        const QSize itemSize = item->sizeHint();
-        // No leading space for the first item in a column.
-        const int spaceY = colItems.isEmpty() ? 0 : verticalSpacing();
+        QSize itemSize = item->sizeHint(); // The suggested size for the current item
 
-        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;
+        // 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
         }
 
+        // Add the item to the current column
         colItems.append(item);
-        colUsedHeight += (colItems.size() > 1 ? verticalSpacing() : 0) + itemSize.height();
-        colWidth = qMax(colWidth, itemSize.width());
+        colWidth = qMax(colWidth, itemSize.width()); // Update the column's width to the widest item
+        currentYPosition += itemSize.height();       // Move y-position for the next item
     }
 
-    layoutSingleColumn(colItems, currentX, originY); // Flush the final column.
-    return currentX + colWidth;
+    // 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;
 }
 
 /**
- * @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.
+ * @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.
  */
 void FlowLayout::layoutSingleColumn(const QVector<QLayoutItem *> &colItems, const int x, int y)
 {
     for (QLayoutItem *item : colItems) {
-        if (!item || item->isEmpty()) {
-            qCDebug(FlowLayoutLog) << "Skipping null or empty item in column.";
+        if (item == nullptr) {
+            qCDebug(FlowLayoutLog) << "Item is null.";
             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) << "Item has no widget; skipping.";
-            continue;
+        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.";
         }
 
-        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;
+        // 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;
 
         // Set the item's geometry based on the computed size and position
         item->setGeometry(QRect(QPoint(x, y), QSize(itemWidth, itemHeight)));
-        y += itemHeight + verticalSpacing();
+
+        // Move the y-position down by the item's height to place the next item below
+        y += itemHeight;
     }
 }
 
 /**
- * @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.
+ * @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.
  */
 QSize FlowLayout::calculateSizeHintHorizontal() const
 {
-    int totalWidth = 0;
-    int maxHeight = 0;
+    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
 
-    for (const QLayoutItem *item : items) {
-        if (!item || item->isEmpty()) {
-            continue;
-        }
-        const QSize s = item->sizeHint();
-        if (totalWidth > 0) {
-            totalWidth += horizontalSpacing();
-        }
-        totalWidth += s.width();
-        maxHeight = qMax(maxHeight, s.height());
-    }
-    return QSize(totalWidth, maxHeight);
-}
+    const int availableWidth = getParentScrollAreaWidth() == 0 ? parentWidget()->width() : getParentScrollAreaWidth();
 
-/**
- * @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
-{
-    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;
-}
-
-/**
- * @brief Preferred size for vertical flow: all items in a single column (unconstrained).
- */
-QSize FlowLayout::calculateSizeHintVertical() const
-{
-    int maxWidth = 0;
-    int totalHeight = 0;
+    qCDebug(FlowLayoutLog) << "Calculating horizontal size hint. Available width:" << availableWidth;
 
     for (const QLayoutItem *item : items) {
         if (!item || item->isEmpty()) {
             qCDebug(FlowLayoutLog) << "Skipping empty item.";
             continue;
         }
-        const QSize s = item->sizeHint();
-        if (totalHeight > 0) {
-            totalHeight += verticalSpacing();
+
+        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;
         }
-        totalHeight += s.height();
-        maxWidth = qMax(maxWidth, s.width());
+
+        currentWidth += itemWidth;
+        rowHeight = qMax(rowHeight, itemSize.height());
+        qCDebug(FlowLayoutLog) << "Updated current width:" << currentWidth << "Updated row height:" << rowHeight;
     }
+
+    // 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 Minimum size for vertical flow: the largest single item.
+ * @brief Calculates the minimum size for horizontal flow direction.
+ * @return A QSize representing the minimum required dimensions.
  */
-QSize FlowLayout::calculateMinimumSizeVertical() const
+QSize FlowLayout::calculateMinimumSizeHorizontal() const
 {
-    QSize size(0, 0);
+    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
+
+    const int availableWidth = getParentScrollAreaWidth() == 0 ? parentWidget()->width() : getParentScrollAreaWidth();
+
+    qCDebug(FlowLayoutLog) << "Calculating horizontal minimum size. Available width:" << availableWidth;
+
     for (const QLayoutItem *item : items) {
         if (!item || item->isEmpty()) {
             qCDebug(FlowLayoutLog) << "Skipping empty item.";
             continue;
         }
-        size = size.expandedTo(item->minimumSize());
+
+        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;
+        }
+
+        currentWidth += itemWidth;
+        rowHeight = qMax(rowHeight, itemMinSize.height());
+        qCDebug(FlowLayoutLog) << "Updated current width:" << currentWidth << "Updated row height:" << rowHeight;
     }
-    return size;
+
+    // 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.
+ */
+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;
+
+    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;
+    }
+
+    // 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);
 }
 
 /**
@@ -397,7 +543,7 @@ QSize FlowLayout::calculateMinimumSizeVertical() const
  */
 void FlowLayout::addItem(QLayoutItem *item)
 {
-    if (item) {
+    if (item != nullptr) {
         items.append(item);
     }
 }
@@ -405,8 +551,11 @@ void FlowLayout::addItem(QLayoutItem *item)
 void FlowLayout::insertWidgetAtIndex(QWidget *toInsert, int index)
 {
     addChildWidget(toInsert);
-    const int bounded = qBound(0, index, static_cast<int>(items.size()));
-    items.insert(bounded, new QWidgetItem(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));
+
     invalidate();
 }
 
@@ -464,13 +613,52 @@ int FlowLayout::verticalSpacing() const
  */
 int FlowLayout::smartSpacing(const QStyle::PixelMetric pm) const
 {
-    QObject *p = parent();
-    if (!p) {
+    QObject *parent = this->parent();
+
+    if (!parent) {
         return -1;
     }
-    if (p->isWidgetType()) {
-        const auto *pw = static_cast<QWidget *>(p);
+
+    if (parent->isWidgetType()) {
+        const auto *pw = dynamic_cast<QWidget *>(parent);
         return pw->style()->pixelMetric(pm, nullptr, pw);
     }
-    return static_cast<QLayout *>(p)->spacing();
-}
\ No newline at end of file
+
+    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;
+}
diff --git a/cockatrice/src/interface/layouts/flow_layout.h b/cockatrice/src/interface/layouts/flow_layout.h
index 9adcd8bb5..cf109d260 100644
--- a/cockatrice/src/interface/layouts/flow_layout.h
+++ b/cockatrice/src/interface/layouts/flow_layout.h
@@ -1,10 +1,8 @@
 /**
  * @file flow_layout.h
  * @ingroup UI
- * @brief A QLayout subclass that arranges child widgets in wrapping rows (horizontal flow)
- *        or wrapping columns (vertical flow).
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef FLOW_LAYOUT_H
 #define FLOW_LAYOUT_H
@@ -12,8 +10,8 @@
 #include <QLayout>
 #include <QList>
 #include <QLoggingCategory>
-#include <QStyle>
 #include <QWidget>
+#include <qstyle.h>
 
 inline Q_LOGGING_CATEGORY(FlowLayoutLog, "flow_layout", QtInfoMsg);
 
@@ -21,55 +19,42 @@ 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);
 
-    // QLayout interface
+    [[nodiscard]] QSize calculateMinimumSizeHorizontal() const;
+    [[nodiscard]] QSize calculateSizeHintVertical() const;
+    [[nodiscard]] QSize calculateMinimumSizeVertical() const;
     void addItem(QLayoutItem *item) override;
     [[nodiscard]] int count() const override;
     [[nodiscard]] QLayoutItem *itemAt(int index) const override;
     QLayoutItem *takeAt(int index) override;
-    void setGeometry(const QRect &rect) override;
+    [[nodiscard]] int horizontalSpacing() const;
 
-    // Size negotiation
     [[nodiscard]] Qt::Orientations expandingDirections() const override;
     [[nodiscard]] bool hasHeightForWidth() const override;
     [[nodiscard]] int heightForWidth(int width) const override;
-    [[nodiscard]] QSize sizeHint() const override;
-    [[nodiscard]] QSize minimumSize() const override;
-
-    // Spacing helpers
-    void setHorizontalMargin(int margin)
-    {
-        horizontalMargin = margin;
-    }
-    [[nodiscard]] int horizontalSpacing() const;
-    void setVerticalMargin(int margin)
-    {
-        verticalMargin = margin;
-    }
     [[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;
 
-    // Layout passes (virtual so subclasses can override placement logic)
+    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 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;
 
 protected:
-    // 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;
+    QList<QLayoutItem *> items; // List to store layout items
     Qt::Orientation flowDirection;
-    int horizontalMargin; ///< Horizontal spacing between items (-1 = use style default)
-    int verticalMargin;   ///< Vertical spacing between items  (-1 = use style default)
+    int horizontalMargin;
+    int verticalMargin;
 };
 
 #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 a4c13518a..9bf5e8468 100644
--- a/cockatrice/src/interface/layouts/overlap_layout.cpp
+++ b/cockatrice/src/interface/layouts/overlap_layout.cpp
@@ -223,7 +223,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 c1b6a8e51..5844fca41 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
diff --git a/cockatrice/src/interface/logger.cpp b/cockatrice/src/interface/logger.cpp
index 3e00a0b24..d6df065e8 100644
--- a/cockatrice/src/interface/logger.cpp
+++ b/cockatrice/src/interface/logger.cpp
@@ -66,9 +66,8 @@ void Logger::openLogfileSession()
 
 void Logger::closeLogfileSession()
 {
-    if (!logToFileEnabled) {
+    if (!logToFileEnabled)
         return;
-    }
 
     logToFileEnabled = false;
     fileStream << "Log session closed at " << QDateTime::currentDateTime().toString() << Qt::endl;
diff --git a/cockatrice/src/interface/logger.h b/cockatrice/src/interface/logger.h
index fc6dd70be..59244e226 100644
--- a/cockatrice/src/interface/logger.h
+++ b/cockatrice/src/interface/logger.h
@@ -1,8 +1,8 @@
 /**
  * @file logger.h
  * @ingroup Core
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef LOGGER_H
 #define LOGGER_H
diff --git a/cockatrice/src/interface/palette_editor/color_button.cpp b/cockatrice/src/interface/palette_editor/color_button.cpp
deleted file mode 100644
index e1a490d20..000000000
--- a/cockatrice/src/interface/palette_editor/color_button.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "color_button.h"
-
-#include <QColorDialog>
-#include <QPainter>
-
-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
deleted file mode 100644
index 4b139ef68..000000000
--- a/cockatrice/src/interface/palette_editor/color_button.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef COCKATRICE_COLOR_BUTTON_H
-#define COCKATRICE_COLOR_BUTTON_H
-
-#include <QColor>
-#include <QToolButton>
-
-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
deleted file mode 100644
index 1b9be1dd4..000000000
--- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
+++ /dev/null
@@ -1,326 +0,0 @@
-#include "palette_editor_dialog.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 <QFrame>
-#include <QGuiApplication>
-#include <QLabel>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QStyleHints>
-#include <QTimer>
-
-PaletteEditorDialog::PaletteEditorDialog(const QString &_themeDirPath, const QString &_themeName, QWidget *parent)
-    : QDialog(parent), themeDirPath(_themeDirPath), themeName(_themeName)
-{
-    setMinimumSize(740, 220);
-    setupUi();
-
-    // 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->loadPalette(workingConfig[loadedScheme]);
-    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);
-    applyBtn = buttonBox->addButton(tr("Apply"), QDialogButtonBox::ApplyRole);
-    saveBtn = buttonBox->addButton(tr("Save && Apply"), 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);
-    connect(quickSetupPanel, &QuickSetupPanel::generateRequested, this, &PaletteEditorDialog::onGenerateFromAccent);
-    connect(revertButton, &QPushButton::clicked, this, &PaletteEditorDialog::onRevertToDefault);
-    connect(resetBtn, &QPushButton::clicked, this, &PaletteEditorDialog::onReset);
-    connect(applyBtn, &QPushButton::clicked, this, &PaletteEditorDialog::onApply);
-    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));
-
-    // Revert button only makes sense when the theme ships default palette files
-    const bool hasDefault = PaletteConfig::fromDefault(themeDirPath, "Light").hasPalette() ||
-                            PaletteConfig::fromDefault(themeDirPath, "Dark").hasPalette();
-    revertButton->setEnabled(hasDefault);
-    if (!hasDefault) {
-        revertButton->setToolTip(tr("This theme ships no default palette files"));
-    } else {
-        revertButton->setToolTip(tr("Replace current colours with the theme author's defaults"));
-    }
-
-    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"));
-    applyBtn->setText(tr("Apply"));
-    saveBtn->setText(tr("Save && Apply"));
-    resetBtn->setToolTip(tr("Discard unsaved edits and restore the last saved palette"));
-    applyBtn->setToolTip(tr("Preview this palette without saving to disk"));
-    saveBtn->setToolTip(tr("Write palette-%1.toml and reload the theme").arg(loadedScheme.toLower()));
-
-    if (themeDirPath.isEmpty()) {
-        saveBtn->setEnabled(false);
-        saveBtn->setToolTip(tr("Cannot save: this theme has no directory on disk"));
-    }
-}
-
-void PaletteEditorDialog::loadSchemes()
-{
-    const QStringList schemes = {"Light", "Dark"};
-    for (const QString &scheme : schemes) {
-        PaletteConfig cfg = PaletteConfig::fromScheme(themeDirPath, scheme);
-
-        if (!cfg.hasPalette()) {
-            cfg = PaletteConfig::fromDefault(themeDirPath, 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);
-    onApply();
-}
-
-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;
-    }
-
-    PaletteConfig cfg = paletteGrid->currentPaletteConfig();
-
-    if (!ThemeManager::savePaletteConfig(themeDirPath, loadedScheme, cfg)) {
-        QMessageBox::warning(this, tr("Save failed"),
-                             tr("Could not write %1 to:\n%2").arg(PaletteConfig::fileName(loadedScheme), themeDirPath));
-        return;
-    }
-
-    ThemeConfig globalCfg = ThemeConfig::fromThemeDir(themeDirPath);
-    globalCfg.colorScheme = loadedScheme;
-    globalCfg.save(themeDirPath);
-
-    savedConfig[loadedScheme] = cfg;
-    workingConfig[loadedScheme] = cfg;
-    themeManager->reloadCurrentTheme();
-    accept();
-}
-
-void PaletteEditorDialog::onReset()
-{
-    workingConfig[loadedScheme] = savedConfig[loadedScheme];
-    paletteGrid->loadPalette(savedConfig[loadedScheme]);
-}
-
-void PaletteEditorDialog::onRevertToDefault()
-{
-    PaletteConfig def = PaletteConfig::fromDefault(themeDirPath, loadedScheme);
-    if (!def.hasPalette()) {
-        QMessageBox::information(this, tr("No default found"),
-                                 tr("No default palette file found for the \"%1\" scheme.").arg(loadedScheme));
-        return;
-    }
-    workingConfig[loadedScheme] = def;
-    paletteGrid->loadPalette(def);
-}
-
-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
deleted file mode 100644
index cec4c1700..000000000
--- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef COCKATRICE_PALETTE_EDITOR_DIALOG_H
-#define COCKATRICE_PALETTE_EDITOR_DIALOG_H
-
-#include "../theme_config.h"
-
-#include <QDialog>
-#include <QFrame>
-#include <QMap>
-
-class QLabel;
-class QComboBox;
-class QDialogButtonBox;
-class QPushButton;
-class PaletteGridWidget;
-class QuickSetupPanel;
-
-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 *applyBtn = nullptr;
-    QPushButton *saveBtn = nullptr;
-    QPushButton *closeBtn = nullptr;
-    QPushButton *revertButton = nullptr;
-
-    // State
-    QString themeDirPath;
-    QString themeName;
-    QString loadedScheme;
-
-    QMap<QString, PaletteConfig> workingConfig;
-    QMap<QString, PaletteConfig> savedConfig;
-
-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
deleted file mode 100644
index d30dd14f1..000000000
--- a/cockatrice/src/interface/palette_editor/palette_generator.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-#include "palette_generator.h"
-
-#include <QColor>
-
-// ════════════════════════════════════════════════════════════════════════════
-//  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;
-
-    // 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
deleted file mode 100644
index 0cec9b5c3..000000000
--- a/cockatrice/src/interface/palette_editor/palette_generator.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#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
deleted file mode 100644
index e4ac5a16f..000000000
--- a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-#include "palette_grid_widget.h"
-
-#include <QApplication>
-#include <QGridLayout>
-#include <QLabel>
-#include <QMetaEnum>
-#include <QScrollArea>
-#include <QTimer>
-#include <QVBoxLayout>
-
-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")},
-};
-
-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);
-            colorButtons[group][role] = btn;
-            grid->addWidget(btn, row + 1, col + 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);
-        }
-    }
-}
-
-PaletteConfig PaletteGridWidget::currentPaletteConfig() const
-{
-    PaletteConfig cfg;
-    for (auto group : ALL_GROUPS) {
-        for (auto role : allRoles()) {
-            cfg.colors[group][role] = colorButtons[group][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
deleted file mode 100644
index 1d85f1ac8..000000000
--- a/cockatrice/src/interface/palette_editor/palette_grid_widget.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef COCKATRICE_PALETTE_GRID_WIDGET_H
-#define COCKATRICE_PALETTE_GRID_WIDGET_H
-
-#include "../theme_config.h"
-#include "color_button.h"
-
-#include <QMap>
-#include <QPalette>
-#include <QVBoxLayout>
-#include <QWidget>
-
-class QLabel;
-class QScrollArea;
-// 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;
-
-private:
-    void buildGrid(QWidget *host);
-    void changeEvent(QEvent *e);
-    void refreshChromePalettes();
-
-    QMap<QPalette::ColorGroup, QMap<QPalette::ColorRole, ColorButton *>> colorButtons;
-    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
deleted file mode 100644
index fe3af9b52..000000000
--- a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-#include "quick_setup_panel.h"
-
-#include <QApplication>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QSlider>
-
-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);
-
-    generateButton = new QPushButton(this);
-
-    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();
-    layout->addWidget(generateButton);
-
-    connect(intensitySlider, &QSlider::valueChanged, this,
-            [this](int v) { intensityPercentageLabel->setText(tr("%1%").arg(v)); });
-    connect(generateButton, &QPushButton::clicked, this,
-            [this] { emit generateRequested(accentButton->getColor(), 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%"));
-
-    generateButton->setText(tr("Generate ↓"));
-    generateButton->setToolTip(tr("Derive all palette roles from the accent colour above.\n"
-                                  "Fine-tune individual colours in the grid afterwards."));
-}
-
-QColor QuickSetupPanel::accentColor() const
-{
-    return accentButton->getColor();
-}
-
-int QuickSetupPanel::intensity() const
-{
-    return intensitySlider->value();
-}
-
-void QuickSetupPanel::setAccentColor(const QColor &c)
-{
-    accentButton->setColor(c);
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/palette_editor/quick_setup_panel.h b/cockatrice/src/interface/palette_editor/quick_setup_panel.h
deleted file mode 100644
index dddd0aaa3..000000000
--- a/cockatrice/src/interface/palette_editor/quick_setup_panel.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef COCKATRICE_QUICK_SETUP_PANEL_H
-#define COCKATRICE_QUICK_SETUP_PANEL_H
-
-#include "color_button.h"
-
-#include <QWidget>
-
-class QPushButton;
-class QHBoxLayout;
-class QLabel;
-class QSlider;
-
-/**
- * @class QuickSetupPanel
- * @brief Provides a compact "Quick Setup" interface for generating theme palettes.
- *
- * The panel contains:
- * - an accent color picker,
- * - an intensity slider,
- * - and a generate button.
- *
- * When the user clicks the generate button, the panel emits
- * generateRequested() with the currently selected accent color
- * and intensity value.
- *
- * 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 when the user requests palette generation.
-     *
-     * @param accent The selected accent color.
-     * @param intensity The selected intensity value.
-     */
-    void generateRequested(QColor accent, int intensity);
-
-private:
-    QHBoxLayout *layout;
-    QLabel *heading;
-    QLabel *accentLabel;
-    ColorButton *accentButton;
-    QLabel *intensityLabel;
-    QLabel *labelLow;
-    QLabel *labelHigh;
-    QSlider *intensitySlider;
-    QLabel *intensityPercentageLabel;
-    QPushButton *generateButton;
-};
-
-#endif // COCKATRICE_QUICK_SETUP_PANEL_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp
index d3b0252a6..382fff317 100644
--- a/cockatrice/src/interface/pixel_map_generator.cpp
+++ b/cockatrice/src/interface/pixel_map_generator.cpp
@@ -77,9 +77,8 @@ 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));
 
@@ -96,22 +95,19 @@ 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));
     }
 
@@ -122,19 +118,17 @@ 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);
@@ -151,13 +145,11 @@ 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);
@@ -360,9 +352,8 @@ 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);
     pmCache.insert(key, pixmap);
@@ -374,9 +365,8 @@ 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);
diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h
index 22f44d8db..61d771c79 100644
--- a/cockatrice/src/interface/pixel_map_generator.h
+++ b/cockatrice/src/interface/pixel_map_generator.h
@@ -1,8 +1,8 @@
 /**
  * @file pixel_map_generator.h
  * @ingroup UI
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef PIXMAPGENERATOR_H
 #define PIXMAPGENERATOR_H
@@ -12,7 +12,6 @@
 #include <QMap>
 #include <QPixmap>
 #include <libcockatrice/network/server/remote/user_level.h>
-#include <optional>
 
 inline Q_LOGGING_CATEGORY(PixelMapGeneratorLog, "pixel_map_generator");
 
diff --git a/cockatrice/src/interface/theme_config.cpp b/cockatrice/src/interface/theme_config.cpp
deleted file mode 100644
index b79c91265..000000000
--- a/cockatrice/src/interface/theme_config.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-#include "theme_config.h"
-
-#include <QDir>
-#include <QFile>
-#include <QMetaEnum>
-#include <QTextStream>
-
-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() ? "Default" : 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();
-}
-
-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";
-    }
-
-    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>();
-
-    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;
-            }
-        }
-
-        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;
-        }
-
-        QColor color(value);
-
-        if (color.isValid()) {
-            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;
-
-    PaletteConfig cfg =
-        fromFile(dir.absoluteFilePath(wantDark ? "palette-default-dark.toml" : "palette-default-light.toml"));
-
-    if (!cfg.hasPalette()) {
-        cfg = fromFile(dir.absoluteFilePath(wantDark ? "palette-default-light.toml" : "palette-default-dark.toml"));
-    }
-
-    return cfg;
-}
-
-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
deleted file mode 100644
index 07bf55b7a..000000000
--- a/cockatrice/src/interface/theme_config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef COCKATRICE_THEME_CONFIG_H
-#define COCKATRICE_THEME_CONFIG_H
-
-#include <QColor>
-#include <QMap>
-#include <QPalette>
-#include <QString>
-
-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;
-
-    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 086845fe6..1dc61fdb7 100644
--- a/cockatrice/src/interface/theme_manager.cpp
+++ b/cockatrice/src/interface/theme_manager.cpp
@@ -15,11 +15,12 @@
 #include <QStyle>
 #include <QStyleFactory>
 #include <QStyleHints>
-#include <QWidget>
 #include <Qt>
 
 #define NONE_THEME_NAME "Default"
-#define FUSION_THEME_NAME "Fusion"
+#define FUSION_THEME_NAME "Fusion (System Default)"
+#define FUSION_THEME_NAME_LIGHT "Fusion (Light)"
+#define FUSION_THEME_NAME_DARK "Fusion (Dark)"
 #define STYLE_CSS_NAME "style.css"
 #define HANDZONE_BG_NAME "handzone"
 #define PLAYERZONE_BG_NAME "playerzone"
@@ -49,9 +50,8 @@ struct PaletteColorInfo
         // 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) {
+            if (role == QPalette::NoRole)
                 continue;
-            }
 
             PaletteColorInfo info;
             info.group = group;
@@ -77,9 +77,8 @@ struct PaletteColorInfo
 
         for (int r = 0; r < QPalette::NColorRoles; ++r) {
             auto role = static_cast<QPalette::ColorRole>(r);
-            if (role == QPalette::NoRole) {
+            if (role == QPalette::NoRole)
                 continue;
-            }
 
             QColor color = palette.color(group, role);
             qInfo().nospace() << qPrintable(QString("%1").arg(roleEnum.valueToKey(role), -20)) << " : "
@@ -92,10 +91,6 @@ struct PaletteColorInfo
 ThemeManager::ThemeManager(QObject *parent) : QObject(parent)
 {
     defaultStyleName = qApp->style()->objectName();
-    //! \todo Workaround for windows11 style being broken.
-    if (defaultStyleName == "windows11") {
-        defaultStyleName = "windowsvista";
-    }
     ensureThemeDirectoryExists();
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
     connect(QGuiApplication::styleHints(), &QStyleHints::colorSchemeChanged, this, &ThemeManager::themeChangedSlot);
@@ -113,42 +108,20 @@ void ThemeManager::ensureThemeDirectoryExists()
     }
 }
 
-bool ThemeManager::isDarkMode(const QString &themeDirPath)
-{
-    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;
-    }
-}
-
-bool ThemeManager::isBuiltInTheme()
-{
-    const auto themeName = SettingsCache::instance().getThemeName();
-
-    return themeName == NONE_THEME_NAME || themeName == FUSION_THEME_NAME;
-}
-
 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());
 
-    // add default value
-    availableThemes.insert(NONE_THEME_NAME, dir.absoluteFilePath("Default"));
-
-    availableThemes.insert(FUSION_THEME_NAME, dir.absoluteFilePath("Fusion"));
+    availableThemes.insert(FUSION_THEME_NAME, dir.filePath("Fusion (System Default)"));
+    availableThemes.insert(FUSION_THEME_NAME_LIGHT, dir.filePath("Fusion (Light)"));
+    availableThemes.insert(FUSION_THEME_NAME_DARK, dir.filePath("Fusion (Dark)"));
 
     for (QString themeName : dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)) {
         if (!availableThemes.contains(themeName)) {
@@ -204,172 +177,200 @@ QBrush ThemeManager::loadExtraBrush(QString fileName, QBrush &fallbackBrush)
     return brush;
 }
 
-ThemeConfig ThemeManager::loadGlobalConfig(const QString &themeDirPath)
+static inline QPalette createDarkGreenFusionPalette()
 {
-    return ThemeConfig::fromThemeDir(themeDirPath);
-}
+    QPalette p;
 
-bool ThemeManager::saveGlobalConfig(const QString &themeDirPath, const ThemeConfig &cfg)
-{
-    return cfg.save(themeDirPath);
-}
+    // ---------- Core backgrounds ----------
+    p.setColor(QPalette::Window, QColor(30, 30, 30));        // #ff1e1e1e
+    p.setColor(QPalette::Base, QColor(45, 45, 45));          // #ff2d2d2d
+    p.setColor(QPalette::AlternateBase, QColor(53, 53, 53)); // #ff353535
+    p.setColor(QPalette::Button, QColor(60, 60, 60));        // #ff3c3c3c
+    p.setColor(QPalette::ToolTipBase, QColor(60, 60, 60));   // #ff3c3c3c
 
-PaletteConfig ThemeManager::loadPaletteConfig(const QString &themeDirPath, const QString &colorScheme)
-{
-    if (themeDirPath.isEmpty()) {
-        return {};
-    }
-    return PaletteConfig::fromScheme(themeDirPath, colorScheme);
-}
+    // ---------- Core text ----------
+    p.setColor(QPalette::WindowText, Qt::white);                       // #ffffffff
+    p.setColor(QPalette::Text, Qt::white);                             // #ffffffff
+    p.setColor(QPalette::ButtonText, Qt::white);                       // #ffffffff
+    p.setColor(QPalette::ToolTipText, QColor(212, 212, 212));          // #ffd4d4d4
+    p.setColor(QPalette::PlaceholderText, QColor(255, 255, 255, 128)); // #80ffffff
 
-bool ThemeManager::savePaletteConfig(const QString &themeDirPath, const QString &colorScheme, const PaletteConfig &cfg)
-{
-    if (themeDirPath.isEmpty()) {
-        return false;
-    }
+    // ---------- Selection / focus ----------
+    const QColor highlight(20, 140, 60); // #ff148c3c
+    p.setColor(QPalette::Highlight, highlight);
+    p.setColor(QPalette::HighlightedText, Qt::white); // #ffffffff
 
-    QDir dir(themeDirPath);
-    if (!dir.exists()) {
-        dir.mkpath(".");
-    }
+    // ---------- Links ----------
+    p.setColor(QPalette::Link, QColor(0, 246, 82));        // #ff00f652
+    p.setColor(QPalette::LinkVisited, QColor(0, 211, 70)); // #ff00d346
 
-    QFile f(dir.absoluteFilePath(PaletteConfig::fileName(colorScheme)));
-    if (!f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
-        return false;
-    }
-
-    QTextStream(&f) << cfg.toToml();
-    return true;
-}
-
-void ThemeManager::setColorScheme(const QString &scheme)
-{
-    const QString dirPath = getAvailableThemes().value(SettingsCache::instance().getThemeName());
-    ThemeConfig cfg = ThemeConfig::fromThemeDir(dirPath);
-
-    cfg.colorScheme = scheme;
-
-    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)
-{
-    QString styleName = themeCfg.styleName;
-    if (styleName.isEmpty() || styleName.compare("Default", Qt::CaseInsensitive) == 0) {
-        if (themeName == FUSION_THEME_NAME) {
-            styleName = "Fusion";
-        } else {
-            styleName = defaultStyleName;
-        }
-    }
-
-    QStyle *style = QStyleFactory::create(styleName);
-    if (!style) {
-        style = QStyleFactory::create(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));
-        }
+    // ---------- Accent (Qt 6) ----------
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0))
+    p.setColor(QPalette::Accent, QColor(0, 211, 70)); // #ff00d346
 #endif
-    } else {
-        base = qApp->palette();
-    }
 
-    // Overlay custom palette colours
-    if (palCfg.hasPalette()) {
-        base = palCfg.apply(base);
-    }
+    // ---------- Bright text ----------
+    p.setColor(QPalette::BrightText, QColor(0, 246, 82)); // #ff00f652
 
-    // 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);
+    // ---------- 3D / frame shading ----------
+    p.setColor(QPalette::Light, QColor(120, 120, 120)); // #ff787878
+    p.setColor(QPalette::Midlight, QColor(90, 90, 90)); // #ff5a5a5a
+    p.setColor(QPalette::Mid, QColor(40, 40, 40));      // #ff282828
+    p.setColor(QPalette::Dark, QColor(30, 30, 30));     // #ff1e1e1e
+    p.setColor(QPalette::Shadow, Qt::black);            // #ff000000
 
-    // 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();
-    }
+    // ---------- Disabled state ----------
+    const QColor disabledText(157, 157, 157); // #ff9d9d9d
+    p.setColor(QPalette::Disabled, QPalette::WindowText, disabledText);
+    p.setColor(QPalette::Disabled, QPalette::Text, disabledText);
+    p.setColor(QPalette::Disabled, QPalette::ButtonText, disabledText);
+    p.setColor(QPalette::Disabled, QPalette::Base, QColor(30, 30, 30));
+    p.setColor(QPalette::Disabled, QPalette::Window, QColor(30, 30, 30));
+    p.setColor(QPalette::Disabled, QPalette::Link, QColor(48, 140, 198));       // #ff308cc6
+    p.setColor(QPalette::Disabled, QPalette::LinkVisited, QColor(255, 0, 255)); // #ffff00ff
+    p.setColor(QPalette::Disabled, QPalette::ToolTipBase, QColor(255, 255, 220));
+    p.setColor(QPalette::Disabled, QPalette::ToolTipText, Qt::black);
+
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0))
+    p.setColor(QPalette::Disabled, QPalette::Accent, disabledText);
+#endif
+
+    // ---------- Inactive state ----------
+    p.setColor(QPalette::Inactive, QPalette::Highlight, QColor(30, 30, 30));
+    p.setColor(QPalette::Inactive, QPalette::HighlightedText, Qt::white);
+
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0))
+    p.setColor(QPalette::Inactive, QPalette::Accent, QColor(30, 30, 30));
+#endif
+
+    return p;
+}
+
+static inline QPalette createLightGreenFusionPalette()
+{
+    QPalette p;
+
+    // ---------- Core backgrounds ----------
+    p.setColor(QPalette::Window, QColor(240, 240, 240));        // #fff0f0f0
+    p.setColor(QPalette::Base, Qt::white);                      // #ffffffff
+    p.setColor(QPalette::AlternateBase, QColor(233, 231, 227)); // #ffe9e7e3
+    p.setColor(QPalette::Button, QColor(240, 240, 240));        // #fff0f0f0
+    p.setColor(QPalette::ToolTipBase, QColor(255, 255, 220));   // #ffffffdc
+
+    // ---------- Core text ----------
+    p.setColor(QPalette::WindowText, Qt::black);                 // #ff000000
+    p.setColor(QPalette::Text, Qt::black);                       // #ff000000
+    p.setColor(QPalette::ButtonText, Qt::black);                 // #ff000000
+    p.setColor(QPalette::ToolTipText, Qt::black);                // #ff000000
+    p.setColor(QPalette::PlaceholderText, QColor(0, 0, 0, 128)); // #80000000
+
+    // ---------- Selection / focus ----------
+    const QColor highlight(20, 140, 60); // #ff148c3c
+    p.setColor(QPalette::Highlight, highlight);
+    p.setColor(QPalette::HighlightedText, Qt::white); // #ffffffff
+
+    // ---------- Links ----------
+    p.setColor(QPalette::Link, QColor(13, 95, 40));       // #ff0d5f28
+    p.setColor(QPalette::LinkVisited, QColor(8, 64, 27)); // #ff08401b
+
+    // ---------- Accent (Qt 6) ----------
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0))
+    p.setColor(QPalette::Accent, QColor(16, 117, 50)); // #ff107532
+#endif
+
+    // ---------- Bright text ----------
+    p.setColor(QPalette::BrightText, Qt::white); // #ffffffff
+
+    // ---------- 3D / frame shading ----------
+    p.setColor(QPalette::Light, Qt::white);                // #ffffffff
+    p.setColor(QPalette::Midlight, QColor(227, 227, 227)); // #ffe3e3e3
+    p.setColor(QPalette::Mid, QColor(160, 160, 160));      // #ffa0a0a0
+    p.setColor(QPalette::Dark, QColor(160, 160, 160));     // #ffa0a0a0
+    p.setColor(QPalette::Shadow, QColor(105, 105, 105));   // #ff696969
+
+    // ---------- Disabled state ----------
+    const QColor disabledText(120, 120, 120); // #ff787878
+    p.setColor(QPalette::Disabled, QPalette::WindowText, disabledText);
+    p.setColor(QPalette::Disabled, QPalette::Text, disabledText);
+    p.setColor(QPalette::Disabled, QPalette::ButtonText, disabledText);
+    p.setColor(QPalette::Disabled, QPalette::Base, QColor(240, 240, 240));
+    p.setColor(QPalette::Disabled, QPalette::Window, QColor(240, 240, 240));
+    p.setColor(QPalette::Disabled, QPalette::Midlight, QColor(247, 247, 247));
+    p.setColor(QPalette::Disabled, QPalette::AlternateBase, QColor(247, 247, 247));
+    p.setColor(QPalette::Disabled, QPalette::Shadow, Qt::black);
+    p.setColor(QPalette::Disabled, QPalette::Link, QColor(0, 0, 255));
+    p.setColor(QPalette::Disabled, QPalette::LinkVisited, QColor(255, 0, 255));
+
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0))
+    p.setColor(QPalette::Disabled, QPalette::Accent, disabledText);
+#endif
+
+    // ---------- Inactive state ----------
+    p.setColor(QPalette::Inactive, QPalette::Highlight, QColor(240, 240, 240));
+    p.setColor(QPalette::Inactive, QPalette::HighlightedText, Qt::black);
+
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0))
+    p.setColor(QPalette::Inactive, QPalette::Accent, QColor(240, 240, 240));
+#endif
+
+    return p;
 }
 
 void ThemeManager::themeChangedSlot()
 {
     QString themeName = SettingsCache::instance().getThemeName();
-    QString dirPath = getAvailableThemes().value(themeName);
-    currentThemePath = dirPath;
-    QDir dir(dirPath);
+    qCInfo(ThemeManagerLog) << "Theme changed:" << themeName;
 
-    // CSS
+    QString dirPath = getAvailableThemes().value(themeName);
+    QDir dir = dirPath;
+
+    // css
     if (!dirPath.isEmpty() && dir.exists(STYLE_CSS_NAME)) {
         qApp->setStyleSheet("file:///" + dir.absoluteFilePath(STYLE_CSS_NAME));
     } else {
         qApp->setStyleSheet("");
     }
 
-    // load theme.cfg for style + scheme preference
-    ThemeConfig themeCfg = ThemeConfig::fromThemeDir(dirPath);
+    if (themeName == FUSION_THEME_NAME) {
+        qApp->setStyle(QStyleFactory::create("Fusion"));
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+        QPalette palette;
+        if (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark) {
+            palette.setColor(QPalette::AlternateBase, QColor(53, 53, 53));
+        }
 
-    // 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);
-    if (!palette.hasPalette()) {
-        palette = PaletteConfig::fromDefault(dirPath, activeScheme);
+        qApp->setPalette(palette);
+#endif
+    } else if (themeName == FUSION_THEME_NAME_LIGHT) {
+        qApp->setStyle(QStyleFactory::create("Fusion"));
+        qApp->setPalette(createLightGreenFusionPalette());
+    } else if (themeName == FUSION_THEME_NAME_DARK) {
+        qApp->setStyle(QStyleFactory::create("Fusion"));
+        qApp->setPalette(createDarkGreenFusionPalette());
+    } else {
+        qApp->setStyle(defaultStyleName); // setting the style also sets the palette
     }
 
-    applyStyleAndPalette(themeName, themeCfg, palette, activeScheme);
+    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);
 
-    QStringList resources;
-    if (!dirPath.isEmpty()) {
-        resources << dir.absolutePath();
+        // 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);
     }
-    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();
     }
diff --git a/cockatrice/src/interface/theme_manager.h b/cockatrice/src/interface/theme_manager.h
index b9e764d08..d942f0fef 100644
--- a/cockatrice/src/interface/theme_manager.h
+++ b/cockatrice/src/interface/theme_manager.h
@@ -1,14 +1,12 @@
 /**
  * @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 <QLoggingCategory>
@@ -43,7 +41,6 @@ public:
 
 private:
     QString defaultStyleName;
-    QString currentThemePath;
     std::array<QBrush, Role::MaxRole + 1> brushes;
     QStringMap availableThemes;
     /*
@@ -55,31 +52,9 @@ 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:
-    bool isBuiltInTheme();
-    bool isDarkMode(const QString &themeDirPath);
     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);
-    void setColorScheme(const QString &scheme);
-
-    void reloadCurrentTheme();
-    void previewPalette(const PaletteConfig &cfg, const QString &scheme);
 
     QBrush &getBgBrush(Role zone);
     QBrush getExtraBgBrush(Role zone, int zoneId = 0);
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 f776d4c77..6512ba890 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,8 +1,8 @@
 /**
  * @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
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 b2f6b62c0..26a186c59 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,8 +1,8 @@
 /**
  * @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
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 0f2d7acd1..8d2c6813f 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,8 +1,8 @@
 /**
  * @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
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 3f36e559c..fa304816f 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
@@ -58,6 +58,16 @@ void CardGroupDisplayWidget::mousePressEvent(QMouseEvent *event)
     }
 }
 
+void CardGroupDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card)
+{
+    emit cardClicked(event, card);
+}
+
+void CardGroupDisplayWidget::onHover(const ExactCard &card)
+{
+    emit cardHovered(card);
+}
+
 void CardGroupDisplayWidget::onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
 {
     auto proxyModel = qobject_cast<QAbstractProxyModel *>(selectionModel->model());
@@ -85,9 +95,8 @@ 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()) {
@@ -144,8 +153,8 @@ QWidget *CardGroupDisplayWidget::constructWidgetForIndex(QPersistentModelIndex i
     widget->setScaleFactor(cardSizeWidget->getSlider()->value());
     widget->setCard(CardDatabaseManager::query()->getCard({cardName, cardProviderId}));
 
-    connect(widget, &CardInfoPictureWithTextOverlayWidget::cardClicked, this, &CardGroupDisplayWidget::cardClicked);
-    connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &CardGroupDisplayWidget::cardHovered);
+    connect(widget, &CardInfoPictureWithTextOverlayWidget::imageClicked, this, &CardGroupDisplayWidget::onClick);
+    connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &CardGroupDisplayWidget::onHover);
     connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, widget, &CardInfoPictureWidget::setScaleFactor);
 
     indexToWidgetMap[index].append(widget);
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 2308ccf8d..0f1209b29 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,8 +1,8 @@
 /**
  * @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
@@ -48,6 +48,8 @@ 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);
@@ -57,7 +59,7 @@ public slots:
     void resizeEvent(QResizeEvent *event) override;
 
 signals:
-    void cardClicked(QMouseEvent *event, const ExactCard &card);
+    void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *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.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h
index 0772c1ab4..e07152b34 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
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 5b4b80d6b..288e46129 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
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 577dafe0a..4930fbbfd 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
@@ -1,6 +1,6 @@
 #include "card_info_display_widget.h"
 
-#include "../../../game_graphics/board/card_item.h"
+#include "../../../game/board/card_item.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
 
@@ -43,13 +43,11 @@ 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 f8f33f3d4..d44c4c205 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
@@ -1,8 +1,8 @@
 /**
  * @file card_info_display_widget.h
  * @ingroup CardWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef CARDINFOWIDGET_H
 #define CARDINFOWIDGET_H
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 2e7c62461..21bee8f54 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
@@ -1,7 +1,7 @@
 #include "card_info_frame_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game_graphics/board/card_item.h"
+#include "../../../game/board/card_item.h"
 #include "card_info_display_widget.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
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 e766fac7a..11b991e87 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
@@ -1,8 +1,8 @@
 /**
  * @file card_info_frame_widget.h
  * @ingroup CardWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef CARDFRAME_H
 #define CARDFRAME_H
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 ce22a1a44..0185f758c 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,8 +1,8 @@
 /**
  * @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
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 a158ac6cf..10eb32940 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,8 +2,8 @@
  * @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
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 3bfd9ce7d..816940b0f 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
@@ -1,7 +1,7 @@
 #include "card_info_picture_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game_graphics/board/card_item.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"
@@ -343,9 +343,11 @@ void CardInfoPictureWidget::mousePressEvent(QMouseEvent *event)
     QWidget::mousePressEvent(event);
     if (event->button() == Qt::RightButton) {
         createRightClickMenu()->popup(QCursor::pos());
+    } else {
+        emit cardClicked();
     }
 
-    emit cardClicked(event, exactCard);
+    emit cardClicked();
 }
 
 void CardInfoPictureWidget::hideEvent(QHideEvent *event)
@@ -431,13 +433,13 @@ QMenu *CardInfoPictureWidget::createAddToOpenDeckMenu()
         QAction *addCard = addCardMenu->addAction(tr("Mainboard"));
         connect(addCard, &QAction::triggered, this, [this, deckEditorTab] {
             deckEditorTab->updateCard(exactCard);
-            deckEditorTab->addCard(exactCard, DECK_ZONE_MAIN);
+            deckEditorTab->actAddCard(exactCard);
         });
 
         QAction *addCardSideboard = addCardMenu->addAction(tr("Sideboard"));
         connect(addCardSideboard, &QAction::triggered, this, [this, deckEditorTab] {
             deckEditorTab->updateCard(exactCard);
-            deckEditorTab->addCard(exactCard, DECK_ZONE_SIDE);
+            deckEditorTab->actAddCardToSideboard(exactCard);
         });
     }
 
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 1f065eed9..1095d7d74 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
@@ -1,8 +1,8 @@
 /**
  * @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
@@ -43,7 +43,7 @@ signals:
     void hoveredOnCard(const ExactCard &hoveredCard);
     void cardScaleFactorChanged(int _scale);
     void cardChanged(const ExactCard &card);
-    void cardClicked(QMouseEvent *event, const ExactCard &card);
+    void cardClicked();
 
 protected:
     void resizeEvent(QResizeEvent *event) override;
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 c5cb59b3b..2f0aeccfd 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
@@ -93,7 +93,7 @@ void CardInfoPictureWithTextOverlayWidget::setHighlighted(bool _highlighted)
 
 void CardInfoPictureWithTextOverlayWidget::mousePressEvent(QMouseEvent *event)
 {
-    emit cardClicked(event, getCard());
+    emit imageClicked(event, this);
 }
 
 /**
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 ba978498d..eed827292 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
@@ -35,6 +35,8 @@ 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 c6af5320b..456e1533a 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
@@ -1,6 +1,6 @@
 #include "card_info_text_widget.h"
 
-#include "../../../game_graphics/board/card_item.h"
+#include "../../../game/board/card_item.h"
 
 #include <QGridLayout>
 #include <QLabel>
@@ -62,7 +62,7 @@ void CardInfoTextWidget::setCard(const ExactCard &exactCard)
     text += QString("<tr><td>%1</td><td width=\"5\"></td><td>%2</td></tr>")
                 .arg(tr("Name:"), card->getName().toHtmlEscaped());
 
-    if (!exactCard.getPrinting().isEmpty()) {
+    if (exactCard.getPrinting() != PrintingInfo()) {
         QString setShort = exactCard.getPrinting().getSet()->getShortName().toHtmlEscaped();
         QString cardNum = exactCard.getPrinting().getProperty("num").toHtmlEscaped();
 
@@ -73,9 +73,8 @@ 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());
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 a9c29da37..95b588882 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
diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.h b/cockatrice/src/interface/widgets/cards/card_size_widget.h
index 9f4c165fd..638c263ea 100644
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.h
@@ -3,8 +3,8 @@
  * @ingroup CardWidgets
  * @ingroup DeckEditorWidgets
  * @ingroup DeckStorageWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef CARD_SIZE_WIDGET_H
 #define 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 eaf3a67b0..a8a97a4ca 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
@@ -51,7 +51,7 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
 //                                                    User Interaction
 // =====================================================================================================================
 
-void DeckCardZoneDisplayWidget::onClick(QMouseEvent *event, const ExactCard &card)
+void DeckCardZoneDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card)
 {
     emit cardClicked(event, card, zoneName);
 }
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 b426fca30..dc0f3d734 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,8 +1,8 @@
 /**
  * @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
@@ -42,7 +42,7 @@ public:
     void addCardsToOverlapWidget();
 
 public slots:
-    void onClick(QMouseEvent *event, const ExactCard &card);
+    void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card);
     void onHover(const ExactCard &card);
     void cleanupInvalidCardGroup(CardGroupDisplayWidget *displayWidget);
     void constructAppropriateWidget(QPersistentModelIndex index);
@@ -55,7 +55,7 @@ public slots:
     void onCategoryRemoval(const QModelIndex &parent, int first, int last);
 
 signals:
-    void cardClicked(QMouseEvent *event, const ExactCard &card, const QString &zoneName);
+    void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card, 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.h b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h
index 154e938aa..acb67a49a 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
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
index e807e9d47..7af641689 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
@@ -17,9 +17,8 @@ AbstractAnalyticsPanelWidget *
 AnalyticsPanelWidgetFactory::create(const QString &type, QWidget *parent, DeckListStatisticsAnalyzer *analyzer) const
 {
     auto it = widgets.find(type);
-    if (it == widgets.end()) {
+    if (it == widgets.end())
         return nullptr;
-    }
 
     auto w = it->creator(parent, analyzer);
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
index 0107294c7..4931aeaa4 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
@@ -20,11 +20,12 @@
 DrawProbabilityWidget::DrawProbabilityWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer)
     : AbstractAnalyticsPanelWidget(parent, analyzer)
 {
-    controls = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
-    controls->setSpacing(4, 4);
+    controls = new QWidget(this);
+    controlLayout = new QHBoxLayout(controls);
+    controlLayout->setContentsMargins(11, 0, 11, 0);
 
     labelPrefix = new QLabel(this);
-    controls->addWidget(labelPrefix);
+    controlLayout->addWidget(labelPrefix);
 
     criteriaCombo = new QComboBox(this);
     // Give these things item-data so we can translate the actual user-facing strings
@@ -32,32 +33,33 @@ DrawProbabilityWidget::DrawProbabilityWidget(QWidget *parent, DeckListStatistics
     criteriaCombo->addItem(QString(), "type");
     criteriaCombo->addItem(QString(), "subtype");
     criteriaCombo->addItem(QString(), "cmc");
-    controls->addWidget(criteriaCombo);
+    controlLayout->addWidget(criteriaCombo);
 
     exactnessCombo = new QComboBox(this);
     exactnessCombo->addItem(QString(), true);  // At least
     exactnessCombo->addItem(QString(), false); // Exactly
-    controls->addWidget(exactnessCombo);
+    controlLayout->addWidget(exactnessCombo);
 
     quantitySpin = new QSpinBox(this);
     quantitySpin->setRange(1, 60);
-    controls->addWidget(quantitySpin);
+    controlLayout->addWidget(quantitySpin);
 
     labelMiddle = new QLabel(this);
-    controls->addWidget(labelMiddle);
+    controlLayout->addWidget(labelMiddle);
 
     drawnSpin = new QSpinBox(this);
     drawnSpin->setRange(1, 60);
     drawnSpin->setValue(7);
-    controls->addWidget(drawnSpin);
+    controlLayout->addWidget(drawnSpin);
 
     labelSuffix = new QLabel(this);
-    controls->addWidget(labelSuffix);
+    controlLayout->addWidget(labelSuffix);
 
     labelPrefix->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     labelMiddle->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     labelSuffix->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 
+    controlLayout->addStretch(1);
     layout->addWidget(controls);
 
     // Table
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
index 9f7b971b1..80015999f 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
@@ -1,8 +1,6 @@
 #ifndef COCKATRICE_DRAW_PROBABILITY_WIDGET_H
 #define COCKATRICE_DRAW_PROBABILITY_WIDGET_H
 
-#include "../../../../layouts/flow_layout.h"
-#include "../../../general/layout_containers/flow_widget.h"
 #include "../../abstract_analytics_panel_widget.h"
 #include "../../deck_list_statistics_analyzer.h"
 #include "draw_probability_config.h"
@@ -33,7 +31,8 @@ private slots:
 private:
     DrawProbabilityConfig config;
 
-    FlowWidget *controls;
+    QWidget *controls;
+    QHBoxLayout *controlLayout;
     QLabel *labelPrefix;
     QLabel *labelMiddle;
     QLabel *labelSuffix;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
index 83e35d57d..3317486ea 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
@@ -28,9 +28,8 @@ ManaBaseConfigDialog::ManaBaseConfigDialog(DeckListStatisticsAnalyzer *analyzer,
 
     // select initial filters
     for (int i = 0; i < filterList->count(); ++i) {
-        if (config.filters.contains(filterList->item(i)->text())) {
+        if (config.filters.contains(filterList->item(i)->text()))
             filterList->item(i)->setSelected(true);
-        }
     }
 
     buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
index 85b2a13b3..39380c07e 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
@@ -1,8 +1,8 @@
 /**
  * @file mana_base_widget.h
  * @ingroup DeckEditorAnalyticsWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef MANA_BASE_WIDGET_H
 #define MANA_BASE_WIDGET_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
index 9e9ae98a6..38199656c 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
@@ -69,9 +69,8 @@ void ManaCurveConfigDialog::setFromConfig(const ManaCurveConfig &cfg)
 {
     groupBy->setCurrentText(cfg.groupBy);
     // restore filters
-    for (int i = 0; i < filterList->count(); ++i) {
+    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);
@@ -82,9 +81,8 @@ void ManaCurveConfigDialog::accept()
     cfg.groupBy = groupBy->currentText();
 
     cfg.filters.clear();
-    for (auto *item : filterList->selectedItems()) {
+    for (auto *item : filterList->selectedItems())
         cfg.filters << item->text();
-    }
 
     cfg.showMain = showMain->isChecked();
     cfg.showCategoryRows = showCatRows->isChecked();
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
index c04767015..f059ff873 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
@@ -51,17 +51,15 @@ void ManaCurveTotalWidget::updateDisplay(const QString &categoryName,
             for (auto it = cmcIt->cbegin(); it != cmcIt->cend(); ++it) {
                 const QString &category = it.key();
 
-                if (!config.filters.isEmpty() && !config.filters.contains(category)) {
+                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()) {
+                if (catIt != cardsMap.cend())
                     cards = catIt->value(cmc);
-                }
 
                 segments.push_back({category, value, cards, GameSpecificColors::MTG::colorHelper(category)});
             }
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
index b182bf954..e09ecfe87 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
@@ -69,18 +69,16 @@ static void buildMapsByCategory(const QHash<QString, QHash<int, int>> &categoryC
         const QString &category = catIt.key();
         const auto &countsByCmc = catIt.value();
 
-        for (auto it = countsByCmc.cbegin(); it != countsByCmc.cend(); ++it) {
+        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) {
+        for (auto it = cardsByCmc.cbegin(); it != cardsByCmc.cend(); ++it)
             outCardsMap[category][it.key()] = it.value();
-        }
     }
 }
 
@@ -90,9 +88,8 @@ static void findGlobalCmcRange(const QHash<QString, QHash<int, int>> &categoryCo
     maxCmc = 0;
 
     for (const auto &countsByCmc : categoryCounts) {
-        for (auto it = countsByCmc.cbegin(); it != countsByCmc.cend(); ++it) {
+        for (auto it = countsByCmc.cbegin(); it != countsByCmc.cend(); ++it)
             maxCmc = qMax(maxCmc, it.key());
-        }
     }
 }
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
index d3e56d44c..da59da9a8 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
@@ -1,8 +1,8 @@
 /**
  * @file mana_curve_widget.h
  * @ingroup DeckEditorAnalyticsWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef MANA_CURVE_WIDGET_H
 #define MANA_CURVE_WIDGET_H
@@ -37,7 +37,7 @@ public:
     {
         config = ManaCurveConfig::fromJson(o);
         updateDisplay();
-    }
+    };
 
     QJsonObject extractConfigFromDialog(QDialog *dlg) const override;
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
index b01c33ba5..80fd03928 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
@@ -26,9 +26,8 @@ ManaDevotionConfigDialog::ManaDevotionConfigDialog(DeckListStatisticsAnalyzer *a
 
     // select initial filters
     for (int i = 0; i < filterList->count(); ++i) {
-        if (config.filters.contains(filterList->item(i)->text())) {
+        if (config.filters.contains(filterList->item(i)->text()))
             filterList->item(i)->setSelected(true);
-        }
     }
 
     buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
index af0215305..833f12938 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
@@ -1,8 +1,8 @@
 /**
  * @file mana_devotion_widget.h
  * @ingroup DeckEditorAnalyticsWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef MANA_DEVOTION_WIDGET_H
 #define 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
index 01af9329c..f70f32d5b 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
@@ -24,9 +24,8 @@ ManaDistributionConfig ManaDistributionConfig::fromJson(const QJsonObject &o)
 
     if (o.contains("filters")) {
         config.filters.clear();
-        for (auto v : o["filters"].toArray()) {
+        for (auto v : o["filters"].toArray())
             config.filters << v.toString();
-        }
     }
 
     if (o.contains("showColorRows")) {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
index 325c70028..7fe4d94e4 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
@@ -62,9 +62,8 @@ void ManaDistributionConfigDialog::setFromConfig(const ManaDistributionConfig &c
 
     displayType->setCurrentText(cfg.displayType);
 
-    for (int i = 0; i < filterList->count(); ++i) {
+    for (int i = 0; i < filterList->count(); ++i)
         filterList->item(i)->setSelected(cfg.filters.contains(filterList->item(i)->text()));
-    }
 
     showColorRows->setChecked(cfg.showColorRows);
 }
@@ -75,9 +74,8 @@ void ManaDistributionConfigDialog::accept()
 
     // Filters
     cfg.filters.clear();
-    for (auto *item : filterList->selectedItems()) {
+    for (auto *item : filterList->selectedItems())
         cfg.filters << item->text();
-    }
 
     cfg.showColorRows = showColorRows->isChecked();
 
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 76552ea2f..ea61302f0 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
@@ -23,20 +23,16 @@ DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnal
     layout = new QVBoxLayout(this);
 
     // Controls
-    controlContainer = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
-    controlContainer->setSpacing(4, 4);
+    controlContainer = new QWidget(this);
+    controlLayout = new QHBoxLayout(controlContainer);
     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);
+    controlLayout->addWidget(addButton);
+    controlLayout->addWidget(removeButton);
+    controlLayout->addWidget(saveButton);
+    controlLayout->addWidget(loadButton);
 
     layout->addWidget(controlContainer);
 
@@ -44,7 +40,6 @@ DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnal
     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);
@@ -71,13 +66,6 @@ void DeckAnalyticsWidget::retranslateUi()
     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()
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 3c73deca2..31ee36fbb 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
@@ -7,12 +7,10 @@
 #ifndef DECK_ANALYTICS_WIDGET_H
 #define DECK_ANALYTICS_WIDGET_H
 
-#include "../general/layout_containers/flow_widget.h"
 #include "abstract_analytics_panel_widget.h"
 #include "deck_list_statistics_analyzer.h"
 #include "resizable_panel.h"
 
-#include <QCheckBox>
 #include <QJsonObject>
 #include <QScrollArea>
 #include <QVBoxLayout>
@@ -31,7 +29,6 @@ public slots:
 public:
     explicit DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer);
     void retranslateUi();
-    void includeSideboardChanged(bool checked);
 
 private slots:
     void onAddPanel();
@@ -52,15 +49,14 @@ private:
     void addPanelInstance(const QString &typeId, AbstractAnalyticsPanelWidget *panel, const QJsonObject &cfg = {});
 
     QVBoxLayout *layout;
-    FlowWidget *controlContainer;
+    QWidget *controlContainer;
+    QHBoxLayout *controlLayout;
 
     QPushButton *addButton;
     QPushButton *removeButton;
     QPushButton *saveButton;
     QPushButton *loadButton;
 
-    QCheckBox *includeSideboardCheckBox;
-
     QScrollArea *scrollArea;
     QWidget *panelContainer;
     QVBoxLayout *panelLayout;
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 add13ff21..ad8afb766 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
@@ -19,13 +19,7 @@ void DeckListStatisticsAnalyzer::analyze()
 {
     clearData();
 
-    QList<const DecklistCardNode *> nodes;
-
-    if (config.includeSideboard) {
-        nodes = model->getCardNodes();
-    } else {
-        nodes = model->getCardNodesForZone(DECK_ZONE_MAIN);
-    }
+    QList<const DecklistCardNode *> nodes = model->getCardNodes();
 
     for (auto node : nodes) {
         CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(node->getName());
@@ -191,12 +185,10 @@ double DeckListStatisticsAnalyzer::hypergeometric(int N, int K, int n, int k)
     }
 
     auto choose = [](int n, int r) -> double {
-        if (r > n) {
+        if (r > n)
             return 0.0;
-        }
-        if (r == 0 || r == n) {
+        if (r == 0 || r == n)
             return 1.0;
-        }
         double res = 1.0;
         for (int i = 1; i <= r; ++i) {
             res *= (n - r + i);
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 52ae751bf..946bb0117 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
@@ -17,7 +17,6 @@ struct DeckListStatisticsAnalyzerConfig
     bool computeCategories = true;
     bool computeCurveBreakdowns = true;
     bool computeProbabilities = true;
-    bool includeSideboard = false;
 };
 
 class DeckListStatisticsAnalyzer : public QObject
@@ -134,11 +133,6 @@ public:
         return model;
     }
 
-    DeckListStatisticsAnalyzerConfig &getConfig()
-    {
-        return config;
-    }
-
 signals:
     void statsUpdated();
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
index f7bb5ac35..a0c971a75 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
@@ -20,6 +20,7 @@ ResizablePanel::ResizablePanel(const QString &_typeId, AbstractAnalyticsPanelWid
     frame = new QFrame(this);
     frame->setFrameShape(QFrame::Box);
     frame->setLineWidth(2);
+    frame->setStyleSheet("border: none;");
 
     auto *frameLayout = new QVBoxLayout(frame);
     frameLayout->setContentsMargins(0, 0, 0, 0);
@@ -29,13 +30,15 @@ ResizablePanel::ResizablePanel(const QString &_typeId, AbstractAnalyticsPanelWid
     frameLayout->addWidget(analyticsPanel);
 
     dropIndicator = new QFrame(frame);
+    dropIndicator->setStyleSheet("background-color: #3daee9;");
     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->setStyleSheet("background-color: rgba(61,174,233,50);"); // semi-transparent blue
+    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
@@ -48,41 +51,24 @@ ResizablePanel::ResizablePanel(const QString &_typeId, AbstractAnalyticsPanelWid
     dragButton = new QPushButton("☰", bottomBar);
     dragButton->setFixedSize(40, 8);
     dragButton->setCursor(Qt::OpenHandCursor);
+    dragButton->setStyleSheet("QPushButton { "
+                              "background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #4a4a4a, stop:1 #3a3a3a); "
+                              "border: none; color: #888; font-size: 10px; }"
+                              "QPushButton:hover { background: #5a5a5a; }");
     bottomLayout->addWidget(dragButton);
 
     // Resize handle fills the rest
     resizeHandle = new QWidget(bottomBar);
     resizeHandle->setFixedHeight(8);
     resizeHandle->setCursor(Qt::SizeVerCursor);
+    resizeHandle->setStyleSheet("background: qlineargradient(x1:0, y1:0, x2:0, y2:1, "
+                                "stop:0 #3a3a3a, stop:1 #2a2a2a);");
     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);
 
diff --git a/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp b/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp
deleted file mode 100644
index a1c29e241..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-#include "card_database_view.h"
-
-#include "../../../client/settings/cache_settings.h"
-#include "card_database_display_model.h"
-#include "card_database_model.h"
-
-#include <QApplication>
-#include <QClipboard>
-#include <QHeaderView>
-#include <QMenu>
-#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>
-
-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::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 (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
deleted file mode 100644
index 175ec12b9..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/card_database_view.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef COCKATRICE_CARD_DATABASE_VIEW_H
-#define COCKATRICE_CARD_DATABASE_VIEW_H
-
-#include "../../key_signals.h"
-
-#include <QTreeView>
-#include <libcockatrice/card/card_info.h>
-
-class CardDatabaseModel;
-class CardDatabaseDisplayModel;
-
-/**
- * @brief The card database table.
- */
-class CardDatabaseView : public QTreeView
-{
-    Q_OBJECT
-
-    KeySignals searchKeySignals;
-    CardDatabaseDisplayModel *databaseDisplayModel;
-
-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;
-    }
-
-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
index 2a491de4f..bacebe385 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
@@ -13,7 +13,7 @@ DeckEditorCardDatabaseDockWidget::DeckEditorCardDatabaseDockWidget(AbstractTabDe
 
 void DeckEditorCardDatabaseDockWidget::createDatabaseDisplayDock(AbstractTabDeckEditor *deckEditor)
 {
-    databaseDisplayWidget = new DeckEditorDatabaseDisplayWidget(this, deckEditor->databaseModel);
+    databaseDisplayWidget = new DeckEditorDatabaseDisplayWidget(this, deckEditor);
 
     auto *frame = new QVBoxLayout;
     frame->setObjectName("databaseDisplayFrame");
@@ -29,16 +29,19 @@ void DeckEditorCardDatabaseDockWidget::createDatabaseDisplayDock(AbstractTabDeck
     // 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);
+    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::addCardToMainDeck, deckEditor,
+            &AbstractTabDeckEditor::actAddCard);
+    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::addCardToSideboard, deckEditor,
+            &AbstractTabDeckEditor::actAddCardToSideboard);
+    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromMainDeck, deckEditor,
+            &AbstractTabDeckEditor::actDecrementCard);
+    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromSideboard, deckEditor,
+            &AbstractTabDeckEditor::actDecrementCardFromSideboard);
+}
+
+CardDatabase *DeckEditorCardDatabaseDockWidget::getDatabase() const
+{
+    return databaseDisplayWidget->databaseModel->getDatabase();
 }
 
 void DeckEditorCardDatabaseDockWidget::retranslateUi()
@@ -55,3 +58,7 @@ void DeckEditorCardDatabaseDockWidget::clearAllDatabaseFilters()
 {
     databaseDisplayWidget->clearAllDatabaseFilters();
 }
+void DeckEditorCardDatabaseDockWidget::highlightAllSearchEdit()
+{
+    databaseDisplayWidget->searchEdit->setSelection(0, databaseDisplayWidget->searchEdit->text().length());
+}
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
index 6af2e4432..6ad442075 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
@@ -17,11 +17,13 @@ public:
 
     DeckEditorDatabaseDisplayWidget *databaseDisplayWidget;
 
+    CardDatabase *getDatabase() const;
     void setFilterTree(FilterTree *filterTree);
 
 public slots:
     void retranslateUi();
     void clearAllDatabaseFilters();
+    void highlightAllSearchEdit();
 
 private:
     void createDatabaseDisplayDock(AbstractTabDeckEditor *deckEditor);
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 9da821813..c625ff1d9 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
@@ -5,17 +5,24 @@
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
 #include "../../pixel_map_generator.h"
-#include "card_database_view.h"
 
 #include <QClipboard>
 #include <QHeaderView>
+#include <QMenu>
 #include <QToolButton>
 #include <QTreeView>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 
-DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, CardDatabaseModel *databaseModel)
-    : QWidget(parent)
+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);
+}
+
+DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *deckEditor)
+    : QWidget(parent), deckEditor(deckEditor)
 {
     setObjectName("databaseDisplayWidget");
 
@@ -29,34 +36,62 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent
     searchEdit->setClearButtonEnabled(true);
     searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
     auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition);
+    searchEdit->installEventFilter(&searchKeySignals);
 
     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 CardDatabaseView(this, databaseDisplayModel);
+    databaseView = new QTreeView(this);
     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"));
@@ -82,39 +117,118 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent
     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*/)
+{
+    if (!current.isValid()) {
+        return;
+    }
+
+    const QString cardName = current.siblingAtColumn(CardDatabaseModel::NameColumn).data().toString();
+
+    if (!current.model()->hasChildren(current.siblingAtColumn(CardDatabaseModel::NameColumn))) {
+        emit cardChanged(CardDatabaseManager::query()->getPreferredCard(cardName));
+    }
+}
+
 void DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck()
 {
-    addCard(databaseView->currentCardName(), DECK_ZONE_MAIN);
+    emit addCardToMainDeck(currentCard());
 }
 
 void DeckEditorDatabaseDisplayWidget::actAddCardToSideboard()
 {
-    addCard(databaseView->currentCardName(), DECK_ZONE_SIDE);
+    emit addCardToSideboard(currentCard());
 }
 
-void DeckEditorDatabaseDisplayWidget::addCard(const QString &cardName, const QString &zoneName)
+void DeckEditorDatabaseDisplayWidget::actDecrementCardFromMainDeck()
 {
-    highlightAllSearchEdit();
-    ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName);
-    emit cardAdded(exactCard, zoneName);
+    emit decrementCardFromMainDeck(currentCard());
 }
 
-void DeckEditorDatabaseDisplayWidget::decrementCard(const QString &cardName, const QString &zoneName)
+void DeckEditorDatabaseDisplayWidget::actDecrementCardFromSideboard()
 {
-    ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName);
-    emit cardDecremented(exactCard, zoneName);
+    emit decrementCardFromSideboard(currentCard());
 }
 
-void DeckEditorDatabaseDisplayWidget::updateCard(const QString &cardName)
+ExactCard DeckEditorDatabaseDisplayWidget::currentCard() const
 {
-    ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName);
-    emit cardChanged(exactCard);
+    const QModelIndex currentIndex = databaseView->selectionModel()->currentIndex();
+    if (!currentIndex.isValid()) {
+        return {};
+    }
+
+    const QString cardName = currentIndex.siblingAtColumn(CardDatabaseModel::NameColumn).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"));
+        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());
 }
 
 void DeckEditorDatabaseDisplayWidget::setFilterTree(FilterTree *filterTree)
@@ -126,15 +240,4 @@ 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 5de4d211d..16ae6e255 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
@@ -9,6 +9,7 @@
 #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 <QHBoxLayout>
@@ -16,56 +17,54 @@
 #include <libcockatrice/models/database/card_database_display_model.h>
 #include <libcockatrice/models/database/card_database_model.h>
 
-class CardDatabaseView;
 class AbstractTabDeckEditor;
-
 class DeckEditorDatabaseDisplayWidget : public QWidget
 {
 
     Q_OBJECT
 public:
-    explicit DeckEditorDatabaseDisplayWidget(QWidget *parent, CardDatabaseModel *databaseModel);
+    explicit DeckEditorDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *deckEditor);
+    AbstractTabDeckEditor *deckEditor;
+    SearchLineEdit *searchEdit;
+    CardDatabaseModel *databaseModel;
+    CardDatabaseDisplayModel *databaseDisplayModel;
 
-    CardDatabaseView *getDatabaseView() const
+    QTreeView *getDatabaseView()
     {
         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 addCard(const QString &cardName, const QString &zoneName);
-    void decrementCard(const QString &cardName, const QString &zoneName);
-    void updateCard(const QString &cardName);
+    void actDecrementCardFromMainDeck();
+    void actDecrementCardFromSideboard();
+    void databaseCustomMenu(QPoint point);
+    void copyDatabaseCellContents();
 
 signals:
-    void cardAdded(const ExactCard &card, const QString &zoneName);
-    void cardDecremented(const ExactCard &card, const QString &zoneName);
+    void addCardToMainDeck(const ExactCard &card);
+    void addCardToSideboard(const ExactCard &card);
+    void decrementCardFromMainDeck(const ExactCard &card);
+    void decrementCardFromSideboard(const ExactCard &card);
     void cardChanged(const ExactCard &_card);
 
-    void edhrecRequested(const CardInfoPtr &cardInfo, bool isCommander);
-    void printingSelectorRequested();
-    void cardInfoRequested(const ExactCard &card);
-
 private:
-    CardDatabaseDisplayModel *databaseDisplayModel;
-    CardDatabaseView *databaseView;
+    KeySignals searchKeySignals;
+    QTreeView *databaseView;
     QHBoxLayout *searchLayout;
-    SearchLineEdit *searchEdit;
     QAction *aAddCard, *aAddCardToSideboard;
     QVBoxLayout *centralFrame;
     QWidget *centralWidget;
 
-    void highlightAllSearchEdit();
-
 private slots:
     void retranslateUi();
-
-    void onRelatedCardClicked(const QString &relatedCard);
+    void saveDbHeaderState();
 };
 
 #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 f751fa225..f939ae99d 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
@@ -314,9 +314,8 @@ void DeckEditorDeckDockWidget::initializeFormats()
 ExactCard DeckEditorDeckDockWidget::getCurrentCard()
 {
     QModelIndex current = deckView->selectionModel()->currentIndex();
-    if (!current.isValid()) {
+    if (!current.isValid())
         return {};
-    }
     const QString cardName = current.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString();
     const QString cardProviderID = current.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data().toString();
     const QModelIndex gparent = current.parent().parent();
@@ -531,7 +530,7 @@ void DeckEditorDeckDockWidget::changeSelectedCard(int changeBy)
     // 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.
+    /// \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);
     }
@@ -635,8 +634,8 @@ 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.
+    // 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
     if (selectedRows.length() == 1) {
         deckView->setSelectionMode(QAbstractItemView::SingleSelection);
     }
@@ -652,12 +651,10 @@ void DeckEditorDeckDockWidget::actSwapSelection()
 
 void DeckEditorDeckDockWidget::actDecrementCard(const ExactCard &card, QString zoneName)
 {
-    if (!card) {
+    if (!card)
         return;
-    }
-    if (card.getInfo().getIsToken()) {
+    if (card.getInfo().getIsToken())
         zoneName = DECK_ZONE_TOKENS;
-    }
 
     deckStateManager->decrementCard(card, zoneName);
 }
@@ -666,8 +663,8 @@ void DeckEditorDeckDockWidget::actDecrementSelection()
 {
     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.
+    // 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
     if (selectedRows.length() == 1) {
         deckView->setSelectionMode(QAbstractItemView::SingleSelection);
     }
@@ -683,8 +680,8 @@ void DeckEditorDeckDockWidget::actRemoveCard()
 {
     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.
+    // 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
     if (selectedRows.length() == 1) {
         deckView->setSelectionMode(QAbstractItemView::SingleSelection);
     }
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 6b18db82e..8a9a6cdaa 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
@@ -89,9 +89,8 @@ 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,9 +105,8 @@ 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_list_style_proxy.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
index e41529b22..14c5faae7 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
@@ -8,9 +8,8 @@
 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);
 
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
index f8fb450ce..8da27b63c 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
@@ -192,9 +192,8 @@ QModelIndex DeckStateManager::addCard(const ExactCard &card, const QString &zone
 
 QModelIndex DeckStateManager::decrementCard(const ExactCard &card, const QString &zoneName)
 {
-    if (!card) {
+    if (!card)
         return {};
-    }
 
     QString providerId = card.getPrinting().getUuid();
     QString collectorNumber = card.getPrinting().getProperty("num");
@@ -242,23 +241,17 @@ static bool doSwapCard(DeckListModel *model,
 
 bool DeckStateManager::swapCardAtIndex(const QModelIndex &idx)
 {
-    if (!idx.isValid()) {
+    if (!idx.isValid())
         return false;
-    }
 
     QString cardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString();
     QString providerId = idx.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data().toString();
     QModelIndex gparent = idx.parent().parent();
 
-    if (!gparent.isValid()) {
+    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)") //
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
index 10312d0a0..4f1ec7e04 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
@@ -154,11 +154,9 @@ public:
      */
     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.
-     */
+    /// @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);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
index fdbc90542..0bb0eb1c9 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
@@ -261,7 +261,13 @@ void DlgConnect::updateDisplayInfo(const QString &saveName)
     QStringList _data = uci.getServerInfo(saveName);
 
     if (_data.isEmpty()) {
-        _data << "" << "" << "" << "" << "" << "" << "";
+        _data << ""
+              << ""
+              << ""
+              << ""
+              << ""
+              << ""
+              << "";
     }
 
     bool savePasswordStatus = (_data.at(5) == "1");
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
index 083dad0ad..41993e068 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_connect.h
  * @ingroup ConnectionDialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_CONNECT_H
 #define DLG_CONNECT_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h
index 6642ad8c6..61eea1d6e 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,8 +2,8 @@
  * @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
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
index 30364f242..7f109f600 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
@@ -215,9 +215,8 @@ DlgCreateGame::DlgCreateGame(const ServerInfo_Game &gameInfo, const QMap<int, QS
     spectatorsSeeEverythingCheckBox->setChecked(gameInfo.spectators_omniscient());
 
     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()) {
@@ -317,9 +316,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 61925286d..e28363311 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_create_game.h
  * @ingroup RoomDialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_CREATEGAME_H
 #define DLG_CREATEGAME_H
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 2d6ee7909..349f4ca4c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
@@ -95,9 +95,8 @@ 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."));
@@ -139,9 +138,8 @@ 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());
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 e584d0731..27af74105 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
@@ -2,8 +2,8 @@
  * @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
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
index d635ac2a8..641b736dc 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_edit_avatar.h
  * @ingroup AccountDialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_EDITAVATAR_H
 #define DLG_EDITAVATAR_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
index cdd4433a7..e3bbc7435 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
@@ -59,7 +59,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 85c72233d..ee8e45985 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_edit_password.h
  * @ingroup AccountDialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_EDITPASSWORD_H
 #define DLG_EDITPASSWORD_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
index 381aa2b11..fe9cd181c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
@@ -149,9 +149,8 @@ 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 "
@@ -182,21 +181,18 @@ 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 202212e98..f19646756 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
index 7015f9d47..dcfbc91e9 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
@@ -26,9 +26,8 @@ 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 35a8bfb46..b89a3be04 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
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
index 8f498cc2c..1bf98822c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
@@ -22,43 +22,41 @@ 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(filters.hideBuddiesOnlyGames);
+    hideBuddiesOnlyGames->setChecked(gamesProxyModel->getHideBuddiesOnlyGames());
 
     hideFullGames = new QCheckBox(tr("Hide full games"));
-    hideFullGames->setChecked(filters.hideFullGames);
+    hideFullGames->setChecked(gamesProxyModel->getHideFullGames());
 
     hideGamesThatStarted = new QCheckBox(tr("Hide games that have started"));
-    hideGamesThatStarted->setChecked(filters.hideGamesThatStarted);
+    hideGamesThatStarted->setChecked(gamesProxyModel->getHideGamesThatStarted());
 
     hidePasswordProtectedGames = new QCheckBox(tr("Hide password protected games"));
-    hidePasswordProtectedGames->setChecked(filters.hidePasswordProtectedGames);
+    hidePasswordProtectedGames->setChecked(gamesProxyModel->getHidePasswordProtectedGames());
 
     hideIgnoredUserGames = new QCheckBox(tr("Hide 'ignored user' games"));
-    hideIgnoredUserGames->setChecked(filters.hideIgnoredUserGames);
+    hideIgnoredUserGames->setChecked(gamesProxyModel->getHideIgnoredUserGames());
 
     hideNotBuddyCreatedGames = new QCheckBox(tr("Hide games not created by buddies"));
-    hideNotBuddyCreatedGames->setChecked(filters.hideNotBuddyCreatedGames);
+    hideNotBuddyCreatedGames->setChecked(gamesProxyModel->getHideNotBuddyCreatedGames());
 
     hideOpenDecklistGames = new QCheckBox(tr("Hide games with forced open decklists"));
-    hideOpenDecklistGames->setChecked(filters.hideOpenDecklistGames);
+    hideOpenDecklistGames->setChecked(gamesProxyModel->getHideOpenDecklistGames());
 
     maxGameAgeComboBox = new QComboBox();
     maxGameAgeComboBox->setEditable(false);
     maxGameAgeComboBox->addItems(gameAgeMap.values());
-    QTime gameAge = filters.maxGameAge;
+    QTime gameAge = gamesProxyModel->getMaxGameAge();
     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(filters.gameNameFilter);
+    gameNameFilterEdit->setText(gamesProxyModel->getGameNameFilter());
     auto *gameNameFilterLabel = new QLabel(tr("Game &description:"));
     gameNameFilterLabel->setBuddy(gameNameFilterEdit);
     creatorNameFilterEdit = new QLineEdit;
-    creatorNameFilterEdit->setText(filters.creatorNameFilters.join(", "));
+    creatorNameFilterEdit->setText(gamesProxyModel->getCreatorNameFilters().join(", "));
     auto *creatorNameFilterLabel = new QLabel(tr("&Creator name:"));
     creatorNameFilterLabel->setBuddy(creatorNameFilterEdit);
 
@@ -78,7 +76,7 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
         gameTypesIterator.next();
 
         auto *temp = new QCheckBox(gameTypesIterator.value());
-        temp->setChecked(filters.gameTypeFilter.contains(gameTypesIterator.key()));
+        temp->setChecked(gamesProxyModel->getGameTypeFilter().contains(gameTypesIterator.key()));
 
         gameTypeFilterCheckBoxes.insert(gameTypesIterator.key(), temp);
         gameTypeFilterLayout->addWidget(temp);
@@ -87,22 +85,21 @@ 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(filters.maxPlayersFilterMin);
+    maxPlayersFilterMinSpinBox->setValue(gamesProxyModel->getMaxPlayersFilterMin());
     maxPlayersFilterMinLabel->setBuddy(maxPlayersFilterMinSpinBox);
 
     auto *maxPlayersFilterMaxLabel = new QLabel(tr("at &most:"));
     maxPlayersFilterMaxSpinBox = new QSpinBox;
     maxPlayersFilterMaxSpinBox->setMinimum(0);
     maxPlayersFilterMaxSpinBox->setMaximum(99);
-    maxPlayersFilterMaxSpinBox->setValue(filters.maxPlayersFilterMax);
+    maxPlayersFilterMaxSpinBox->setValue(gamesProxyModel->getMaxPlayersFilterMax());
     maxPlayersFilterMaxLabel->setBuddy(maxPlayersFilterMaxSpinBox);
 
     auto *maxPlayersFilterLayout = new QGridLayout;
@@ -127,17 +124,17 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
     restrictionsGroupBox->setLayout(restrictionsLayout);
 
     showOnlyIfSpectatorsCanWatch = new QCheckBox(tr("Show games only if &spectators can watch"));
-    showOnlyIfSpectatorsCanWatch->setChecked(filters.showOnlyIfSpectatorsCanWatch);
+    showOnlyIfSpectatorsCanWatch->setChecked(gamesProxyModel->getShowOnlyIfSpectatorsCanWatch());
     connect(showOnlyIfSpectatorsCanWatch, &QCheckBox::toggled, this,
             &DlgFilterGames::toggleSpectatorCheckboxEnabledness);
 
     showSpectatorPasswordProtected = new QCheckBox(tr("Show spectator password p&rotected games"));
-    showSpectatorPasswordProtected->setChecked(filters.showSpectatorPasswordProtected);
+    showSpectatorPasswordProtected->setChecked(gamesProxyModel->getShowSpectatorPasswordProtected());
     showOnlyIfSpectatorsCanChat = new QCheckBox(tr("Show only if spectators can ch&at"));
-    showOnlyIfSpectatorsCanChat->setChecked(filters.showOnlyIfSpectatorsCanChat);
+    showOnlyIfSpectatorsCanChat->setChecked(gamesProxyModel->getShowOnlyIfSpectatorsCanChat());
     showOnlyIfSpectatorsCanSeeHands = new QCheckBox(tr("Show only if spectators can see &hands"));
-    showOnlyIfSpectatorsCanSeeHands->setChecked(filters.showOnlyIfSpectatorsCanSeeHands);
-    toggleSpectatorCheckboxEnabledness(filters.showOnlyIfSpectatorsCanWatch);
+    showOnlyIfSpectatorsCanSeeHands->setChecked(gamesProxyModel->getShowOnlyIfSpectatorsCanSeeHands());
+    toggleSpectatorCheckboxEnabledness(getShowOnlyIfSpectatorsCanWatch());
 
     auto *spectatorsLayout = new QGridLayout;
     spectatorsLayout->addWidget(showOnlyIfSpectatorsCanWatch, 0, 0);
@@ -183,27 +180,6 @@ 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(),
-            getCreatorNameFilters(),
-            getGameTypeFilter(),
-            maxPlayersFilterMinSpinBox->value(),
-            maxPlayersFilterMaxSpinBox->value(),
-            getMaxGameAge(),
-            showOnlyIfSpectatorsCanWatch->isChecked(),
-            getShowSpectatorPasswordProtected(),
-            getShowOnlyIfSpectatorsCanChat(),
-            getShowOnlyIfSpectatorsCanSeeHands()};
-}
-
 void DlgFilterGames::actOk()
 {
     accept();
@@ -216,6 +192,46 @@ void DlgFilterGames::toggleSpectatorCheckboxEnabledness(bool spectatorsEnabled)
     showOnlyIfSpectatorsCanSeeHands->setDisabled(!spectatorsEnabled);
 }
 
+bool DlgFilterGames::getHideFullGames() 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);
@@ -227,22 +243,36 @@ 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->getFilters().maxGameAge; // leave the setting unchanged
+    if (index < 0 || index >= gameAgeMap.size()) { // index is out of bounds
+        return gamesProxyModel->getMaxGameAge();   // 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 447f9b16c..abfdab28a 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
@@ -1,8 +1,8 @@
 /**
  * @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
@@ -48,14 +48,6 @@ private:
 
     const QMap<int, QString> &allGameTypes;
     const GamesProxyModel *gamesProxyModel;
-    const QMap<QTime, QString> gameAgeMap;
-
-    [[nodiscard]] QStringList getCreatorNameFilters() 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();
@@ -66,7 +58,32 @@ public:
                    const GamesProxyModel *_gamesProxyModel,
                    QWidget *parent = nullptr);
 
-    [[nodiscard]] GameFilterConfigs getFilters() const;
+    [[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;
 };
 
 #endif
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 d32e2fc3e..e8925b1d3 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_forgot_password_challenge.h
  * @ingroup AccountDialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_FORGOTPASSWORDCHALLENGE_H
 #define DLG_FORGOTPASSWORDCHALLENGE_H
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 2cf352e0d..e51dad810 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_forgot_password_request.h
  * @ingroup AccountDialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_FORGOTPASSWORDREQUEST_H
 #define DLG_FORGOTPASSWORDREQUEST_H
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 d2eb081d1..c9c41722e 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
@@ -121,7 +121,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 8a443b906..3d110c71d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_forgot_password_reset.h
  * @ingroup AccountDialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_FORGOTPASSWORDRESET_H
 #define DLG_FORGOTPASSWORDRESET_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
index 27d658902..b103f6a56 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
@@ -2,8 +2,8 @@
  * @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
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 dce9d712c..0e59653ea 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,8 +2,8 @@
  * @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
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 2890148b9..1ac98d206 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,8 +2,8 @@
  * @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
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 9c81e9ae3..b7e0d7aa3 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
@@ -2,8 +2,8 @@
  * @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
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
index d2d291556..52466ff10 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
@@ -20,7 +20,6 @@ DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
     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);
@@ -28,13 +27,12 @@ DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
 
     startingLifeTotalLabel = new QLabel(tr("Starting life total:"), this);
     startingLifeTotalEdit = new QSpinBox(this);
-    startingLifeTotalEdit->setMinimum(-999999999);
-    startingLifeTotalEdit->setMaximum(999999999);
+    startingLifeTotalEdit->setMinimum(1);
+    startingLifeTotalEdit->setMaximum(99999);
     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);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
index c693fb02e..a4f54564f 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
@@ -16,7 +16,6 @@
 #include <QPushButton>
 #include <QToolBar>
 #include <QTreeView>
-#include <QtConcurrentRun>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_set/card_sets_model.h>
@@ -217,9 +216,8 @@ void WndSets::saveHeaderState()
 
 void WndSets::rebuildMainLayout(int actionToTake)
 {
-    if (mainLayout == nullptr) {
+    if (mainLayout == nullptr)
         return;
-    }
 
     switch (actionToTake) {
         case NO_SETS_SELECTED:
@@ -255,11 +253,6 @@ 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();
 }
 
@@ -383,14 +376,12 @@ 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;
 
@@ -408,14 +399,12 @@ 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;
 
@@ -433,9 +422,8 @@ 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();
@@ -460,9 +448,8 @@ 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 2ed5eca0f..d9b77a76e 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
index 0f7c17b18..a3f232d9b 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
@@ -311,9 +311,8 @@ 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();
@@ -357,7 +356,7 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
 
 void DlgRegister::actOk()
 {
-    //! \todo This stuff should be using QValidators.
+    //! \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;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.h b/cockatrice/src/interface/widgets/dialogs/dlg_register.h
index abed9ff51..bebbfc500 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_register.h
  * @ingroup AccountDialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_REGISTER_H
 #define DLG_REGISTER_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 bc846bf3d..5d9e2679c 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
@@ -237,9 +237,8 @@ QMap<QString, int> DlgSelectSetForCards::getSetsForCards()
 
     for (auto cardName : cardNames) {
         CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(cardName);
-        if (!infoPtr) {
+        if (!infoPtr)
             continue;
-        }
 
         SetToPrintingsMap setMap = infoPtr->getSets();
         for (auto &setName : setMap.keys()) {
@@ -360,9 +359,8 @@ QMap<QString, QStringList> DlgSelectSetForCards::getCardsForSets()
 
     for (auto cardName : cardNames) {
         CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(cardName);
-        if (!infoPtr) {
+        if (!infoPtr)
             continue;
-        }
 
         SetToPrintingsMap setMap = infoPtr->getSets();
         for (auto it = setMap.begin(); it != setMap.end(); ++it) {
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 92f285aa0..795366b57 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,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
index ff42596ea..e3bf209dc 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
@@ -1,29 +1,1760 @@
 #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 "../main.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/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_loader.h"
-#include "libcockatrice/card/database/card_database_manager.h"
+#include "override_printing_warning.h"
 
+#include <../../client/settings/card_counter_settings.h>
+#include <QAbstractButton>
+#include <QAbstractListModel>
+#include <QAction>
+#include <QApplication>
+#include <QCheckBox>
 #include <QCloseEvent>
+#include <QColorDialog>
+#include <QComboBox>
+#include <QDebug>
+#include <QDesktopServices>
 #include <QDialogButtonBox>
-#include <QDir>
-#include <QGuiApplication>
+#include <QFileDialog>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QInputDialog>
+#include <QLabel>
+#include <QLineEdit>
 #include <QListWidget>
 #include <QMessageBox>
+#include <QPushButton>
 #include <QScreen>
 #include <QScrollArea>
 #include <QScrollBar>
+#include <QSlider>
+#include <QSpinBox>
 #include <QStackedWidget>
-#include <QVBoxLayout>
+#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));
+        updateHomeTabSettingsVisibility();
+    });
+
+    homeTabBackgroundShuffleFrequencySpinBox.setRange(0, 3600);
+    homeTabBackgroundShuffleFrequencySpinBox.setSuffix(tr(" seconds"));
+    homeTabBackgroundShuffleFrequencySpinBox.setValue(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency());
+    connect(&homeTabBackgroundShuffleFrequencySpinBox, qOverload<int>(&QSpinBox::valueChanged),
+            &SettingsCache::instance(), &SettingsCache::setHomeTabBackgroundShuffleFrequency);
+
+    homeTabDisplayCardNameCheckBox.setChecked(settings.getHomeTabDisplayCardName());
+    connect(&homeTabDisplayCardNameCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
+            &SettingsCache::setHomeTabDisplayCardName);
+
+    updateHomeTabSettingsVisibility();
+
+    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);
+    themeGrid->addWidget(&homeTabDisplayCardNameLabel, 4, 0);
+    themeGrid->addWidget(&homeTabDisplayCardNameCheckBox, 4, 1);
+
+    themeGroupBox = new QGroupBox;
+    themeGroupBox->setLayout(themeGrid);
+
+    // Menu settings
+    showShortcutsCheckBox.setChecked(settings.getShowShortcuts());
+    connect(&showShortcutsCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &AppearanceSettingsPage::showShortcutsChanged);
+
+    showGameSelectorFilterToolbarCheckBox.setChecked(settings.getShowGameSelectorFilterToolbar());
+    connect(&showGameSelectorFilterToolbarCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
+            &SettingsCache::setShowGameSelectorFilterToolbar);
+
+    auto *menuGrid = new QGridLayout;
+    menuGrid->addWidget(&showShortcutsCheckBox, 0, 0);
+    menuGrid->addWidget(&showGameSelectorFilterToolbarCheckBox, 1, 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::updateHomeTabSettingsVisibility()
+{
+    bool visible =
+        SettingsCache::instance().getHomeTabBackgroundSource() != BackgroundSources::toId(BackgroundSources::Theme);
+
+    homeTabBackgroundShuffleFrequencyLabel.setVisible(visible);
+    homeTabBackgroundShuffleFrequencySpinBox.setVisible(visible);
+    homeTabDisplayCardNameLabel.setVisible(visible);
+    homeTabDisplayCardNameCheckBox.setVisible(visible);
+}
+
+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);
+
+    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().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"));
+    homeTabDisplayCardNameLabel.setText(tr("Display card name of background in bottom right:"));
+
+    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"));
+
+    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);
+
+    showDragSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowDragSelectionCount());
+    connect(&showDragSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setShowDragSelectionCount);
+
+    showTotalSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowTotalSelectionCount());
+    connect(&showTotalSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setShowTotalSelectionCount);
+
+    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(&showDragSelectionCountCheckBox, 7, 0);
+    generalGrid->addWidget(&showTotalSelectionCountCheckBox, 8, 0);
+    generalGrid->addWidget(&useTearOffMenusCheckBox, 9, 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"));
+    showDragSelectionCountCheckBox.setText(tr("Show selection counter during drag selection"));
+    showTotalSelectionCountCheckBox.setText(tr("Show total selection counter"));
+    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)
 {
@@ -54,11 +1785,10 @@ DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent)
     contentsWidget->setSpacing(5);
 
     pagesWidget = new QStackedWidget;
-    pagesWidget->addWidget(makeScrollable(new GeneralSettingsPage));
+    pagesWidget->addWidget(new GeneralSettingsPage);
     pagesWidget->addWidget(makeScrollable(new AppearanceSettingsPage));
     pagesWidget->addWidget(makeScrollable(new UserInterfaceSettingsPage));
     pagesWidget->addWidget(new DeckEditorSettingsPage);
-    pagesWidget->addWidget(makeScrollable(new StorageSettingsPage));
     pagesWidget->addWidget(new MessagesSettingsPage);
     pagesWidget->addWidget(new SoundSettingsPage);
     pagesWidget->addWidget(new ShortcutSettingsPage);
@@ -107,11 +1837,6 @@ void DlgSettings::createIcons()
     deckEditorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
     deckEditorButton->setIcon(QPixmap("theme:config/deckeditor"));
 
-    storageButton = new QListWidgetItem(contentsWidget);
-    storageButton->setTextAlignment(Qt::AlignHCenter);
-    storageButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    storageButton->setIcon(QPixmap("theme:config/storage"));
-
     messagesButton = new QListWidgetItem(contentsWidget);
     messagesButton->setTextAlignment(Qt::AlignHCenter);
     messagesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
@@ -132,9 +1857,8 @@ void DlgSettings::createIcons()
 
 void DlgSettings::changePage(QListWidgetItem *current, QListWidgetItem *previous)
 {
-    if (!current) {
+    if (!current)
         current = previous;
-    }
 
     pagesWidget->setCurrentIndex(contentsWidget->row(current));
 }
@@ -206,7 +1930,7 @@ void DlgSettings::closeEvent(QCloseEvent *event)
     }
 
     if (!QDir(SettingsCache::instance().getDeckPath()).exists() || SettingsCache::instance().getDeckPath().isEmpty()) {
-        //! \todo Prompt to create the deck directory.
+        //! \todo Prompt to create it
         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?"),
@@ -217,7 +1941,7 @@ void DlgSettings::closeEvent(QCloseEvent *event)
     }
 
     if (!QDir(SettingsCache::instance().getPicsPath()).exists() || SettingsCache::instance().getPicsPath().isEmpty()) {
-        //! \todo Prompt to create the pictures directory.
+        //! \todo Prompt to create it
         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?"),
@@ -236,7 +1960,6 @@ void DlgSettings::retranslateUi()
     generalButton->setText(tr("General"));
     appearanceButton->setText(tr("Appearance"));
     userInterfaceButton->setText(tr("User Interface"));
-    storageButton->setText(tr("Storage"));
     deckEditorButton->setText(tr("Card Sources"));
     messagesButton->setText(tr("Chat"));
     soundButton->setText(tr("Sound"));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
index 3ffee6388..b655a30bc 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
@@ -1,21 +1,343 @@
 /**
  * @file dlg_settings.h
  * @ingroup Dialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_SETTINGS_H
 #define DLG_SETTINGS_H
 
+#include <QCheckBox>
 #include <QComboBox>
 #include <QDialog>
+#include <QGroupBox>
+#include <QLabel>
 #include <QLoggingCategory>
+#include <QPushButton>
+#include <QSpinBox>
+#include <libcockatrice/utility/macros.h>
 
 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 QStackedWidget;
 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 updateHomeTabSettingsVisibility();
+    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 homeTabDisplayCardNameLabel;
+    QCheckBox homeTabDisplayCardNameCheckBox;
+    QLabel minPlayersForMultiColumnLayoutLabel;
+    QLabel maxFontSizeForCardsLabel;
+    QCheckBox showShortcutsCheckBox;
+    QCheckBox showGameSelectorFilterToolbarCheckBox;
+    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 showDragSelectionCountCheckBox;
+    QCheckBox showTotalSelectionCountCheckBox;
+    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 DlgSettings : public QDialog
 {
@@ -31,8 +353,8 @@ private slots:
 private:
     QListWidget *contentsWidget;
     QStackedWidget *pagesWidget;
-    QListWidgetItem *generalButton, *appearanceButton, *userInterfaceButton, *deckEditorButton, *storageButton,
-        *messagesButton, *soundButton, *shortcutsButton;
+    QListWidgetItem *generalButton, *appearanceButton, *userInterfaceButton, *deckEditorButton, *messagesButton,
+        *soundButton, *shortcutsButton;
     void createIcons();
     void retranslateUi();
 
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 d26610983..44fc59d58 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
@@ -1,8 +1,8 @@
 /**
  * @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
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 e493481d0..3dad7c652 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,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
index 15735168f..0a9244dec 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
@@ -40,7 +40,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);
@@ -154,9 +154,8 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, Releas
                 "</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 {
         QMessageBox::information(
             this, tr("Update Available"),
@@ -220,9 +219,7 @@ void DlgUpdate::downloadSuccessful(const QUrl &filepath)
 {
     setLabel(tr("Installing..."));
     // Try to open the installer. If it opens, quit Cockatrice
-    if (QProcess::startDetached(filepath.toLocalFile(),
-                                QStringList()
-                                    << "/R" << QString("/D=%1").arg(QCoreApplication::applicationDirPath()))) {
+    if (QDesktopServices::openUrl(filepath)) {
         QMetaObject::invokeMethod(static_cast<MainWindow *>(parent()), "close", Qt::QueuedConnection);
         qCInfo(DlgUpdateLog) << "Opened downloaded update file successfully - closing Cockatrice";
         close();
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.h b/cockatrice/src/interface/widgets/dialogs/dlg_update.h
index 7bd0020d5..daf0b9e47 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_update.h
  * @ingroup ClientUpdateDialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_UPDATE_H
 #define DLG_UPDATE_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
index 4eb054647..3dd0fedb3 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
@@ -60,9 +60,8 @@ 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 5c7315b50..f0b900527 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_view_log.h
  * @ingroup ServerLogDialogs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DLG_VIEWLOG_H
 #define DLG_VIEWLOG_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 66170792a..94996e975 100644
--- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
@@ -73,9 +73,8 @@ 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 9cda07e2b..d61fddab5 100644
--- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
+++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/interface/widgets/general/background_sources.h b/cockatrice/src/interface/widgets/general/background_sources.h
index 423111bb6..15bf1d377 100644
--- a/cockatrice/src/interface/widgets/general/background_sources.h
+++ b/cockatrice/src/interface/widgets/general/background_sources.h
@@ -1,8 +1,8 @@
 /**
  * @file background_sources.h
  * @ingroup UI
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COCKATRICE_BACKGROUND_SOURCES_H
 #define COCKATRICE_BACKGROUND_SOURCES_H
@@ -40,9 +40,8 @@ public:
     static QString toId(Type type)
     {
         for (const auto &e : all()) {
-            if (e.type == type) {
+            if (e.type == type)
                 return e.id;
-            }
         }
         return {};
     }
@@ -50,9 +49,8 @@ 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
     }
@@ -60,9 +58,8 @@ 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/banner_widget.cpp b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
index 5de5457ea..f03869a4d 100644
--- a/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
@@ -7,8 +7,8 @@
 #include <QPainter>
 #include <QVBoxLayout>
 
-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,12 +18,7 @@ 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);
-
-    QString textColor;
-    if (transparency > 50) {
-        textColor = " color: white;";
-    }
-    bannerLabel->setStyleSheet("font-size: 24px; font-weight: bold;" + textColor);
+    bannerLabel->setStyleSheet("font-size: 24px; font-weight: bold; color: white;");
 
     layout->addWidget(iconLabel);
     layout->addWidget(bannerLabel);
diff --git a/cockatrice/src/interface/widgets/general/display/banner_widget.h b/cockatrice/src/interface/widgets/general/display/banner_widget.h
index 77a05abb6..8a81dcfce 100644
--- a/cockatrice/src/interface/widgets/general/display/banner_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/banner_widget.h
@@ -3,8 +3,8 @@
  * @ingroup Widgets
  * @ingroup DeckEditorCardGroupWidgets
  * @ingroup DeckStorageWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef BANNER_WIDGET_H
 #define BANNER_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
index d9e108e6a..998808307 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
@@ -52,9 +52,8 @@ void BarChartWidget::paintEvent(QPaintEvent *)
     int barAreaWidth = right - left;
 
     int barCount = bars.size();
-    if (barCount == 0) {
+    if (barCount == 0)
         return;
-    }
 
     int spacing = 6;
     int barWidth = (barAreaWidth - (barCount - 1) * spacing) / barCount;
@@ -92,9 +91,8 @@ void BarChartWidget::paintEvent(QPaintEvent *)
         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) {
+            if (segHeight < 2 && seg.value > 0)
                 segHeight = 2;
-            }
 
             int topY = yCurrent - segHeight;
 
@@ -191,9 +189,8 @@ void BarChartWidget::mouseMoveEvent(QMouseEvent *e)
     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) {
+        if (segHeight < 2 && seg.value > 0)
             segHeight = 2;
-        }
 
         int topY = yCurrent - segHeight;
         int bottomY = yCurrent;
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
index 05814f15b..67ad24995 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
@@ -2,8 +2,8 @@
  * @file bar_widget.h
  * @ingroup Widgets
  * @ingroup DeckEditorAnalyticsWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef BAR_WIDGET_H
 #define BAR_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
index 12ab5bb3b..ed91ba03d 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
@@ -26,19 +26,16 @@ QSize ColorBar::minimumSizeHint() const
 
 void ColorBar::paintEvent(QPaintEvent *)
 {
-    if (colors.isEmpty()) {
+    if (colors.isEmpty())
         return;
-    }
 
     int total = 0;
-    for (const auto &pair : colors) {
+    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);
@@ -66,9 +63,8 @@ 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);
 
@@ -104,9 +100,8 @@ 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());
@@ -117,21 +112,18 @@ void ColorBar::mouseMoveEvent(QMouseEvent *event)
 #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 (const auto &pair : colors) {
+    for (const auto &pair : colors)
         total += pair.second;
-    }
 
-    if (total == 0) {
+    if (total == 0)
         return {};
-    }
 
     int pos = 0;
 
@@ -157,14 +149,12 @@ 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/charts/bars/color_bar.h b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
index 100f95310..0ef68f578 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
@@ -99,13 +99,13 @@ protected:
     void mouseMoveEvent(QMouseEvent *event) override;
 
 private:
-    /** @brief Map of color keys to counts used for rendering. */
+    /// Map of color keys to counts used for rendering.
     QList<QPair<QString, int>> colors;
 
-    /** @brief True if the mouse is currently inside the widget. */
+    /// True if the mouse is currently inside the widget.
     bool isHovered = false;
 
-    /** @brief Minimum ratio a segment must exceed to be drawn. */
+    /// Minimum ratio a segment must exceed to be drawn.
     double minRatioThreshold = 0.0;
 
     /**
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
index 9cd6039c8..ff7d91363 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
@@ -2,8 +2,8 @@
  * @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
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
index 9bad32bda..e027aabdd 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
@@ -44,9 +44,8 @@ void SegmentedBarWidget::paintEvent(QPaintEvent *)
         const auto &seg = segments[i];
 
         int segHeight = total > 0 ? (seg.value * barHeight / total) : 0;
-        if (segHeight < 2) {
+        if (segHeight < 2)
             segHeight = 2;
-        }
 
         QRect r(barX, yCurrent - segHeight, barWidth, segHeight);
         bool isTop = (i == segments.size() - 1);
@@ -111,9 +110,8 @@ int SegmentedBarWidget::segmentAt(int y) const
         int top = currentTop - segHeight;
         int bottom = currentTop;
 
-        if (y >= top && y <= bottom) {
+        if (y >= top && y <= bottom)
             return i;
-        }
 
         currentTop -= segHeight;
     }
diff --git a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
index b129fbe18..84232b36f 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
@@ -157,9 +157,8 @@ QString ColorPie::tooltipForPoint(const QPoint &pt) const
 
     QPointF v = pt - center;
     double distance = std::hypot(v.x(), v.y());
-    if (distance > size / 2.0) {
+    if (distance > size / 2.0)
         return {};
-    }
 
     double angle = std::atan2(-v.y(), v.x()) * 180.0 / M_PI;
     if (angle < 0) {
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h
index c9b159b02..ca3043d10 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,8 +1,8 @@
 /**
  * @file dynamic_font_size_label.h
  * @ingroup Widgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DYNAMICFONTSIZELABEL_H
 #define DYNAMICFONTSIZELABEL_H
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 540abfe6b..19e67fd28 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,8 +1,8 @@
 /**
  * @file dynamic_font_size_push_button.h
  * @ingroup PrintingWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DYNAMICFONTSIZEPUSHBUTTON_H
 #define DYNAMICFONTSIZEPUSHBUTTON_H
diff --git a/cockatrice/src/interface/widgets/general/display/labeled_input.h b/cockatrice/src/interface/widgets/general/display/labeled_input.h
index 838dfb280..8424e09f0 100644
--- a/cockatrice/src/interface/widgets/general/display/labeled_input.h
+++ b/cockatrice/src/interface/widgets/general/display/labeled_input.h
@@ -1,8 +1,8 @@
 /**
  * @file labeled_input.h
  * @ingroup DeckEditorCardGroupWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef LABELED_INPUT_H
 #define LABELED_INPUT_H
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 69232691e..b2344b7d0 100644
--- a/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
+++ b/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
@@ -1,8 +1,8 @@
 /**
  * @file shadow_background_label.h
  * @ingroup PrintingWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef STYLEDLABEL_H
 #define STYLEDLABEL_H
diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.h b/cockatrice/src/interface/widgets/general/home_styled_button.h
index f8d97e9aa..a053993da 100644
--- a/cockatrice/src/interface/widgets/general/home_styled_button.h
+++ b/cockatrice/src/interface/widgets/general/home_styled_button.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp
index e1687f997..ea20ef6a0 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@@ -2,7 +2,6 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
-#include "../../theme_manager.h"
 #include "../../window_main.h"
 #include "background_sources.h"
 #include "home_styled_button.h"
@@ -47,8 +46,6 @@ HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
             &HomeWidget::onBackgroundShuffleFrequencyChanged);
     // Lambda is cleaner to read than overloading this
     connect(&SettingsCache::instance(), &SettingsCache::homeTabDisplayCardNameChanged, this, [this] { repaint(); });
-    connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this,
-            &HomeWidget::initializeBackgroundFromSource);
     connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this,
             &HomeWidget::updateButtonsToBackgroundColor);
 }
@@ -139,9 +136,8 @@ void HomeWidget::updateRandomCard()
             }
             break;
     }
-    if (!newCard) {
+    if (!newCard)
         return;
-    }
 
     connect(newCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &HomeWidget::updateBackgroundProperties);
     backgroundSourceCard->setCard(newCard);
@@ -260,7 +256,7 @@ void HomeWidget::updateConnectButton(const ClientStatus status)
 
 QPair<QColor, QColor> HomeWidget::extractDominantColors(const QPixmap &pixmap)
 {
-    if (themeManager->isBuiltInTheme() &&
+    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));
     }
diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h
index 90d003aa7..b30bb5407 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.h
+++ b/cockatrice/src/interface/widgets/general/home_widget.h
@@ -2,8 +2,8 @@
  * @file home_widget.h
  * @ingroup Core
  * @ingroup Widgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef HOME_WIDGET_H
 #define 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 025f457bd..75ab56b34 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp
@@ -1,52 +1,42 @@
 /**
  * @file flow_widget.cpp
- * @brief Implementation of FlowWidget — a QWidget hosting a FlowLayout inside an
- *        optional QScrollArea.
+ * @brief Implementation of the FlowWidget class for organizing widgets in a flow layout within a scrollable area.
  */
 
 #include "flow_widget.h"
 
 #include <QHBoxLayout>
 #include <QResizeEvent>
-#include <QScrollArea>
-#include <QSizePolicy>
 #include <QWidget>
+#include <qscrollarea.h>
+#include <qsizepolicy.h>
 
 /**
- * @brief Constructs a FlowWidget.
+ * @brief Constructs a FlowWidget with a scrollable layout.
  *
- * 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.
+ * @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.
  */
 FlowWidget::FlowWidget(QWidget *parent,
                        const Qt::Orientation _flowDirection,
                        const Qt::ScrollBarPolicy horizontalPolicy,
                        const Qt::ScrollBarPolicy verticalPolicy)
-    : QWidget(parent), scrollArea(nullptr), flowDirection(_flowDirection)
-
+    : QWidget(parent), flowDirection(_flowDirection)
 {
-    // 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);
+    // Main Widget and Layout
+    if (_flowDirection == Qt::Horizontal) {
+        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+        setMinimumWidth(0);
     } else {
-        setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+        setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
+        setMinimumHeight(0);
     }
-
     mainLayout = new QHBoxLayout(this);
-    mainLayout->setContentsMargins(0, 0, 0, 0);
     setLayout(mainLayout);
 
-    const bool useScrollArea = (horizontalPolicy != Qt::ScrollBarAlwaysOff || verticalPolicy != Qt::ScrollBarAlwaysOff);
-
-    // Scroll area (optional)
-    if (useScrollArea) {
+    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.
         scrollArea = new QScrollArea(this);
         scrollArea->setWidgetResizable(true);
         scrollArea->setMinimumSize(0, 0);
@@ -58,28 +48,39 @@ FlowWidget::FlowWidget(QWidget *parent,
         scrollArea = nullptr;
     }
 
-    // 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);
+    // Flow Layout inside the scroll area
+    if (horizontalPolicy == Qt::ScrollBarAlwaysOff && verticalPolicy == Qt::ScrollBarAlwaysOff) {
+        container = new QWidget(this);
+    } else {
+        container = new QWidget(scrollArea);
+    }
 
     flowLayout = new FlowLayout(container, flowDirection);
-    container->setLayout(flowLayout);
 
-    if (useScrollArea) {
+    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 {
         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.
+ *
  * @param widget_to_add The widget to add to the flow layout.
  */
 void FlowWidget::addWidget(QWidget *widget_to_add) const
@@ -99,75 +100,77 @@ void FlowWidget::removeWidget(QWidget *widgetToRemove) const
 }
 
 /**
- * @brief Removes all widgets from the flow layout and deletes them.
+ * @brief Clears all widgets from the flow layout.
  *
- * If the layout pointer has somehow been lost it is recreated before returning.
+ * Deletes each widget and layout item, and recreates the flow layout if it was removed.
  */
 void FlowWidget::clearLayout()
 {
-    if (flowLayout) {
+    if (flowLayout != nullptr) {
         QLayoutItem *item;
-        while ((item = flowLayout->takeAt(0))) {
-            if (item->widget()) {
-                item->widget()->deleteLater();
-            }
-            delete item;
+        while ((item = flowLayout->takeAt(0)) != nullptr) {
+            item->widget()->deleteLater(); // Delete the widget
+            delete item;                   // Delete the layout item
         }
     } else {
-        // Defensive fallback: recreate the layout if it was deleted externally.
         flowLayout = new FlowLayout(container, flowDirection);
         container->setLayout(flowLayout);
     }
 }
 
 /**
- * @brief Marks the flow layout as dirty so Qt recomputes item positions.
+ * @brief Handles resize events for the FlowWidget.
  *
- * 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.
+ * Triggers layout recalculation and adjusts the scroll area content size.
+ *
+ * @param event The resize event containing the new size information.
  */
 void FlowWidget::resizeEvent(QResizeEvent *event)
 {
     QWidget::resizeEvent(event);
-    qCDebug(FlowWidgetSizeLog) << "resizeEvent:" << event->size();
 
-    if (flowLayout) {
-        flowLayout->invalidate();
+    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();
     }
 }
 
-void FlowWidget::setSpacing(int hSpacing, int vSpacing)
-{
-    flowLayout->setHorizontalMargin(hSpacing);
-    flowLayout->setVerticalMargin(vSpacing);
-    flowLayout->invalidate();
-}
-
 /**
- * @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.
+ * @brief Sets the minimum size for all widgets inside the FlowWidget to the maximum sizeHint of all of them.
  */
 void FlowWidget::setMinimumSizeToMaxSizeHint()
 {
-    QSize maxSize(0, 0);
+    QSize maxSize(0, 0); // Initialize to a zero size
 
     // Iterate over all widgets in the flow layout to find the maximum sizeHint
     for (int i = 0; i < flowLayout->count(); ++i) {
-        QLayoutItem *item = flowLayout->itemAt(i);
-        if (item && item->widget()) {
-            maxSize = maxSize.expandedTo(item->widget()->sizeHint());
+        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()));
+            }
         }
     }
 
     // Set the minimum size for all widgets to the max sizeHint
     for (int i = 0; i < flowLayout->count(); ++i) {
-        QLayoutItem *item = flowLayout->itemAt(i);
-        if (item && item->widget()) {
-            item->widget()->setMinimumSize(maxSize);
+        if (QLayoutItem *item = flowLayout->itemAt(i)) {
+            if (QWidget *widget = item->widget()) {
+                widget->setMinimumSize(maxSize);
+            }
         }
     }
 }
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 a232336d8..d9fa49937 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
@@ -1,24 +1,22 @@
 /**
  * @file flow_widget.h
  * @ingroup UI
- * @brief A QWidget that wraps a FlowLayout inside an optional QScrollArea.
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef FLOW_WIDGET_H
 #define FLOW_WIDGET_H
-
 #include "../../../layouts/flow_layout.h"
 
 #include <QHBoxLayout>
 #include <QLoggingCategory>
-#include <QScrollArea>
 #include <QWidget>
+#include <qscrollarea.h>
 
 inline Q_LOGGING_CATEGORY(FlowWidgetLog, "flow_widget", QtInfoMsg);
 inline Q_LOGGING_CATEGORY(FlowWidgetSizeLog, "flow_widget.size", QtInfoMsg);
 
-class FlowWidget : public QWidget
+class FlowWidget final : public QWidget
 {
     Q_OBJECT
 
@@ -27,20 +25,17 @@ public:
                Qt::Orientation orientation,
                Qt::ScrollBarPolicy horizontalPolicy,
                Qt::ScrollBarPolicy verticalPolicy);
-
     void addWidget(QWidget *widget_to_add) const;
     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; ///< Null when both scroll policies are AlwaysOff.
+    QScrollArea *scrollArea;
 
 public slots:
     void setMinimumSizeToMaxSizeHint();
-    void setSpacing(int hSpacing, int vSpacing);
 
 protected:
     void resizeEvent(QResizeEvent *event) override;
@@ -52,4 +47,4 @@ private:
     QWidget *container;
 };
 
-#endif // FLOW_WIDGET_H
\ No newline at end of file
+#endif // FLOW_WIDGET_H
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 97068978d..2fd6cd6b8 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
@@ -33,7 +33,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 104a97da9..b2c19a07f 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,8 +1,8 @@
 /**
  * @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
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 62c620201..9ac6ac80e 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
@@ -1,8 +1,8 @@
 /**
  * @file overlap_widget.h
  * @ingroup UI
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef OVERLAP_WIDGET_H
 #define OVERLAP_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
index eff9257bb..ac8f3b787 100644
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
+++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/interface/widgets/menus/tearoff_menu.h b/cockatrice/src/interface/widgets/menus/tearoff_menu.h
index ef1dfbcb3..3e6c47012 100644
--- a/cockatrice/src/interface/widgets/menus/tearoff_menu.h
+++ b/cockatrice/src/interface/widgets/menus/tearoff_menu.h
@@ -1,8 +1,8 @@
 /**
  * @file tearoff_menu.h
  * @ingroup GameMenus
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #pragma once
 
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 05e269174..36bccbcc3 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
@@ -8,7 +8,7 @@
  * @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 all the mainboard, tokensboard and sideboard zones.
+ * UI elements for managing card counts in both the mainboard and sideboard zones.
  *
  * @param parent The parent widget.
  * @param deckStateManager Pointer to the DeckStateManager
@@ -31,28 +31,13 @@ AllZonesCardAmountWidget::AllZonesCardAmountWidget(QWidget *parent,
     buttonBoxMainboard = new CardAmountWidget(this, deckStateManager, cardSizeSlider, rootCard, DECK_ZONE_MAIN);
     zoneLabelSideboard = new ShadowBackgroundLabel(this, tr("Sideboard"));
     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(12);
-    layout->addWidget(zoneLabelTokensboard, 0, Qt::AlignHCenter | Qt::AlignBottom);
-    layout->addWidget(buttonBoxTokensboard, 0, Qt::AlignHCenter | Qt::AlignTop);
-    layout->addSpacing(13);
+    layout->addSpacing(25);
     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()); });
@@ -82,17 +67,15 @@ 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)
+void AllZonesCardAmountWidget::setAmounts(int mainboardAmount, int sideboardAmount)
 {
     buttonBoxMainboard->setAmount(mainboardAmount);
     buttonBoxSideboard->setAmount(sideboardAmount);
-    buttonBoxTokensboard->setAmount(tokensboardAmount);
 }
 
 /**
@@ -116,21 +99,11 @@ int AllZonesCardAmountWidget::getSideboardAmount()
 }
 
 /**
- * @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.
+ * @brief Checks if the amount is at least one in either the mainboard or sideboard.
  */
 bool AllZonesCardAmountWidget::isNonZero()
 {
-    return getMainboardAmount() > 0 || getSideboardAmount() > 0 || getTokensboardAmount() > 0;
+    return getMainboardAmount() > 0 || getSideboardAmount() > 0;
 }
 
 /**
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 de4a984be..d158d257e 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,8 +2,8 @@
  * @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
@@ -23,7 +23,6 @@ public:
                                       const ExactCard &rootCard);
     int getMainboardAmount();
     int getSideboardAmount();
-    int getTokensboardAmount();
     bool isNonZero();
 
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
@@ -34,7 +33,7 @@ public:
 
 public slots:
     void adjustFontSize(int scalePercentage);
-    void setAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount);
+    void setAmounts(int mainboardAmount, int sideboardAmount);
 
 private:
     QVBoxLayout *layout;
@@ -43,8 +42,6 @@ private:
     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 ff47e7b9c..25222f437 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
@@ -11,7 +11,7 @@
  * @param parent The parent widget.
  * @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 , DECK_ZONE_SIDE, or DECK_ZONE_TOKENS).
+ * @param zoneName The zone name (e.g., DECK_ZONE_MAIN or DECK_ZONE_SIDE).
  */
 CardAmountWidget::CardAmountWidget(QWidget *parent,
                                    DeckStateManager *deckStateManager,
@@ -36,16 +36,13 @@ 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, Sideboard, or Tokensboard)
+    // Set up connections based on the zone (Mainboard or Sideboard)
     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(amount), this);
@@ -140,19 +137,6 @@ void CardAmountWidget::updateCardCount()
     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,
@@ -177,9 +161,9 @@ static QModelIndex addAndReplacePrintings(DeckListModel *model,
 }
 
 /**
- * @brief Adds a printing of the card to the specified zone (Mainboard, Sideboard, or Tokensboard).
+ * @brief Adds a printing of the card to the specified zone (Mainboard or Sideboard).
  *
- * @param zone The zone to add the card to (DECK_ZONE_MAIN, DECK_ZONE_SIDE, or DECK_ZONE_TOKENS).
+ * @param zone The zone to add the card to (DECK_ZONE_MAIN or DECK_ZONE_SIDE).
  */
 void CardAmountWidget::addPrinting(const QString &zone)
 {
@@ -199,13 +183,12 @@ void CardAmountWidget::addPrinting(const QString &zone)
         }
     }
 
-    QString zoneName = zoneLogName(zone);
     QString reason = QString("Added %1 copies of '%2 (%3) %4' to %5 [ProviderID: %6]%7")
                          .arg(1 + extraCopies)
                          .arg(rootCard.getName())
                          .arg(rootCard.getPrinting().getSet()->getShortName())
                          .arg(rootCard.getPrinting().getProperty("num"))
-                         .arg(zoneName)
+                         .arg(zone == DECK_ZONE_MAIN ? "mainboard" : "sideboard")
                          .arg(rootCard.getPrinting().getUuid())
                          .arg(replacingProviderless ? " (replaced providerless printings)" : "");
 
@@ -235,14 +218,6 @@ 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.
  */
@@ -259,27 +234,18 @@ void CardAmountWidget::removePrintingSideboard()
     decrementCardHelper(DECK_ZONE_SIDE);
 }
 
-/**
- * @brief Removes a printing from the tokens zone.
- */
-void CardAmountWidget::removePrintingTokensboard()
-{
-    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, DECK_ZONE_SIDE, or DECK_ZONE_TOKENS).
+ * @param zone The zone from which to remove the card (DECK_ZONE_MAIN or DECK_ZONE_SIDE).
  */
 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(zoneName)
+                         .arg(zone == DECK_ZONE_MAIN ? "mainboard" : "sideboard")
                          .arg(rootCard.getPrinting().getUuid());
 
     deckStateManager->modifyDeck(reason, [this, &zone](auto model) {
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 2780e3ad2..3051b1691 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
@@ -2,8 +2,8 @@
  * @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
@@ -60,10 +60,8 @@ private:
 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 76a416587..71b93b297 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
@@ -105,30 +105,23 @@ void PrintingSelector::printingsInDeckChanged()
 }
 
 /**
- * @return A map of uuid to amounts (main, side, tokens).
+ * @return A map of uuid to amounts (main, side).
  */
-static QMap<QString, ZoneCounts> tallyUuidCounts(const DeckListModel *model, const QString &cardName)
+static QMap<QString, QPair<int, int>> tallyUuidCounts(const DeckListModel *model, const QString &cardName)
 {
-    QMap<QString, ZoneCounts> map;
+    QMap<QString, QPair<int, int>> map;
 
     auto mainNodes = model->getCardNodesForZone(DECK_ZONE_MAIN);
     for (auto &node : mainNodes) {
         if (node->getName() == cardName) {
-            map[node->getCardProviderId()].mainboard += node->getNumber();
+            map[node->getCardProviderId()].first += 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();
+            map[node->getCardProviderId()].second += node->getNumber();
         }
     }
 
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
index 14d73f836..f7844504d 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
@@ -1,8 +1,8 @@
 /**
  * @file printing_selector.h
  * @ingroup PrintingWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef PRINTING_SELECTOR_H
 #define PRINTING_SELECTOR_H
@@ -22,13 +22,6 @@
 
 #define BATCH_SIZE 10
 
-struct ZoneCounts
-{
-    int mainboard = 0;
-    int sideboard = 0;
-    int tokensboard = 0;
-};
-
 class DeckStateManager;
 class PrintingSelectorCardSearchWidget;
 class PrintingSelectorCardSelectionWidget;
@@ -66,9 +59,9 @@ signals:
 
     /**
      * The amounts of the printings in the deck has changed
-     * @param uuidToAmounts Map of uuids to the amounts (maindeck, sideboard, tokensboard) in the deck
+     * @param uuidToAmounts Map of uuids to the amounts (maindeck, sideboard) in the deck
      */
-    void cardAmountsChanged(const QMap<QString, ZoneCounts> &uuidToAmounts);
+    void cardAmountsChanged(const QMap<QString, QPair<int, int>> &uuidToAmounts);
 
 private:
     QVBoxLayout *layout;
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 edeba86d1..7d0b4882f 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
@@ -67,10 +67,10 @@ void PrintingSelectorCardDisplayWidget::clampSetNameToPicture()
     update();
 }
 
-void PrintingSelectorCardDisplayWidget::updateCardAmounts(const QMap<QString, ZoneCounts> &uuidToAmounts)
+void PrintingSelectorCardDisplayWidget::updateCardAmounts(const QMap<QString, QPair<int, int>> &uuidToAmounts)
 {
-    auto counts = uuidToAmounts.value(rootCard.getPrinting().getUuid());
-    overlayWidget->updateCardAmounts(counts.mainboard, counts.sideboard, counts.tokensboard);
+    auto [main, side] = uuidToAmounts.value(rootCard.getPrinting().getUuid());
+    overlayWidget->updateCardAmounts(main, side);
 }
 
 void PrintingSelectorCardDisplayWidget::resizeEvent(QResizeEvent *event)
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 4de561f4f..ac5c7c05f 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,8 +1,8 @@
 /**
  * @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
@@ -27,7 +27,7 @@ public:
 
 public slots:
     void clampSetNameToPicture();
-    void updateCardAmounts(const QMap<QString, ZoneCounts> &uuidToAmounts);
+    void updateCardAmounts(const QMap<QString, QPair<int, int>> &uuidToAmounts);
 
     void resizeEvent(QResizeEvent *event) override;
 
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 dd5f6dd7f..1508b5243 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
@@ -116,11 +116,9 @@ void PrintingSelectorCardOverlayWidget::enterEvent(QEvent *event)
     updateVisibility();
 }
 
-void PrintingSelectorCardOverlayWidget::updateCardAmounts(int mainboardAmount,
-                                                          int sideboardAmount,
-                                                          int tokensboardAmount)
+void PrintingSelectorCardOverlayWidget::updateCardAmounts(int mainboardAmount, int sideboardAmount)
 {
-    allZonesCardAmountWidget->setAmounts(mainboardAmount, sideboardAmount, tokensboardAmount);
+    allZonesCardAmountWidget->setAmounts(mainboardAmount, sideboardAmount);
     updateVisibility();
 }
 
@@ -149,9 +147,8 @@ void PrintingSelectorCardOverlayWidget::updateVisibility()
  */
 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 =
@@ -175,8 +172,8 @@ 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 all of the mainboard, sideboard, and
- * tokensboard amounts are zero.
+ * When the cursor leaves the widget, the card amount widget is hidden if both the mainboard and sideboard
+ * amounts are zero.
  *
  * @param event The event triggered when the mouse leaves the widget.
  */
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 52a43d220..ae2307c45 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,8 +1,8 @@
 /**
  * @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
@@ -39,7 +39,7 @@ signals:
     void cardPreferenceChanged();
 
 public slots:
-    void updateCardAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount);
+    void updateCardAmounts(int mainboardAmount, int sideboardAmount);
 
 private slots:
     void updateVisibility();
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 3efabe13c..821addd01 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,8 +1,8 @@
 /**
  * @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
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 0aa56c9d8..ecd5c83e3 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,8 +1,8 @@
 /**
  * @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
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 bb5b60cdc..b5a00b81e 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,8 +1,8 @@
 /**
  * @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
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 140f190df..220f57256 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,8 +2,8 @@
  * @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
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 badc437ee..81812104a 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
@@ -35,33 +35,19 @@ void SettingsButtonWidget::setButtonIcon(QPixmap iconMap)
     button->setIcon(iconMap);
 }
 
-void SettingsButtonWidget::setButtonText(const QString &text)
+void SettingsButtonWidget::setButtonText(const QString &buttonText)
 {
-    buttonText = text;
-
+    // 🔓 unlock size constraints
     button->setMinimumSize(QSize(0, 0));
     button->setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
+
     button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    button->setText(text);
+    button->setText(buttonText);
+
     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);
-    }
+    button->setMinimumWidth(button->sizeHint().width());
 }
 
 void SettingsButtonWidget::togglePopup()
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 5dcbe059a..36f01ac38 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
@@ -2,8 +2,8 @@
  * @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
@@ -23,11 +23,6 @@ public:
     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;
@@ -39,8 +34,6 @@ 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.h b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
index 01e86abfe..e9605e473 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
@@ -2,8 +2,8 @@
  * @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
diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.cpp b/cockatrice/src/interface/widgets/replay/replay_manager.cpp
index a1330a82d..fac3576f2 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_manager.cpp
@@ -19,19 +19,16 @@ ReplayManager::ReplayManager(TabGame *parent, GameReplay *_replay)
         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)) {
+            while ((j < eventCount) && (replay->event_list(j).seconds_elapsed() == lastEventTimestamp))
                 ++j;
-            }
 
             const int numberEventsThisSecond = j - i;
-            for (int k = 0; k < numberEventsThisSecond; ++k) {
+            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) {
+            if (j < eventCount)
                 lastEventTimestamp = replay->event_list(j).seconds_elapsed();
-            }
             i += numberEventsThisSecond - 1;
         }
     }
@@ -98,7 +95,8 @@ ReplayManager::ReplayManager(TabGame *parent, GameReplay *_replay)
 
 void ReplayManager::replayNextEvent(EventProcessingOptions options)
 {
-    emit eventReplayed(replay->event_list(timelineWidget->getCurrentEvent()), options);
+    game->getGame()->getGameEventHandler()->processGameEventContainer(
+        replay->event_list(timelineWidget->getCurrentEvent()), nullptr, options);
 }
 
 void ReplayManager::replayFinished()
diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.h b/cockatrice/src/interface/widgets/replay/replay_manager.h
index a3e0126c7..9469adcd4 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.h
+++ b/cockatrice/src/interface/widgets/replay/replay_manager.h
@@ -2,8 +2,8 @@
  * @file replay_manager.h
  * @ingroup Core
  * @ingroup Replay
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef REPLAY_MANAGER_H
 #define REPLAY_MANAGER_H
@@ -27,7 +27,6 @@ public:
 
 signals:
     void requestChatAndPhaseReset();
-    void eventReplayed(const GameEventContainer &cont, EventProcessingOptions options);
 
 private:
     // Replay related members
diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
index 46a3dff40..25ee58b67 100644
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
@@ -27,23 +27,20 @@ void ReplayTimelineWidget::setTimeline(const QList<int> &_replayTimeline)
     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();
 }
@@ -56,9 +53,8 @@ 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);
@@ -103,12 +99,8 @@ void ReplayTimelineWidget::skipToTime(int newTime, bool doRewindBuffering)
     update();
 }
 
-/**
- * @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.
- */
+/// @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) {
@@ -150,12 +142,11 @@ void ReplayTimelineWidget::replayTimerTimeout()
 
     processNewEvents(NORMAL_PLAYBACK);
 
-    if (!(currentVisualTime % 1000)) {
+    if (!(currentVisualTime % 1000))
         update();
-    }
 }
 
-/** @brief Processes all unprocessed events up to the current time. */
+/// Processes all unprocessed events up to the current time.
 void ReplayTimelineWidget::processNewEvents(PlaybackMode playbackMode)
 {
     currentProcessedTime = currentVisualTime;
@@ -165,14 +156,12 @@ void ReplayTimelineWidget::processNewEvents(PlaybackMode playbackMode)
 
         // 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) {
+        if (playbackMode == BACKWARD_SKIP || currentProcessedTime - replayTimeline[currentEvent] > BIG_SKIP_MS)
             options |= SKIP_REVEAL_WINDOW;
-        }
 
         // backwards skip => always skip tap animation
-        if (playbackMode == BACKWARD_SKIP) {
+        if (playbackMode == BACKWARD_SKIP)
             options |= SKIP_TAP_ANIMATION;
-        }
 
         emit processNextEvent(options);
         ++currentEvent;
diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
index 418d0c7e0..07a0c0b4c 100644
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
@@ -1,8 +1,8 @@
 /**
  * @file replay_timeline_widget.h
  * @ingroup Replay
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef REPLAY_TIMELINE_WIDGET
 #define REPLAY_TIMELINE_WIDGET
diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
index ccbbe9246..731f30942 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
@@ -88,11 +88,10 @@ void ChatView::refreshBlockColors()
     for (QTextBlock block = doc->begin(); block.isValid(); block = block.next()) {
         QTextBlockFormat fmt = block.blockFormat();
 
-        if (even) {
+        if (even)
             fmt.setBackground(palette().base());
-        } else {
+        else
             fmt.setBackground(palette().window());
-        }
 
         fmt.setForeground(palette().text());
 
@@ -122,11 +121,10 @@ QTextCursor ChatView::prepareBlock(bool same)
         cursor.insertHtml("<br>");
     } else {
         QTextBlockFormat blockFormat;
-        if (evenNumber) {
+        if (evenNumber)
             blockFormat.setBackground(palette().base());
-        } else {
+        else
             blockFormat.setBackground(palette().window());
-        }
 
         evenNumber = !evenNumber;
 
@@ -146,9 +144,8 @@ void ChatView::appendHtml(const QString &html)
 {
     bool atBottom = verticalScrollBar()->value() >= verticalScrollBar()->maximum();
     prepareBlock().insertHtml(html);
-    if (atBottom) {
+    if (atBottom)
         verticalScrollBar()->setValue(verticalScrollBar()->maximum());
-    }
 }
 
 void ChatView::appendHtmlServerMessage(const QString &html, bool optionalIsBold, QString optionalFontColor)
@@ -159,14 +156,12 @@ void ChatView::appendHtmlServerMessage(const QString &html, bool optionalIsBold,
         "<font color=" + ((optionalFontColor.size() > 0) ? optionalFontColor : serverMessageColor.name()) + ">" +
         QDateTime::currentDateTime().toString("[hh:mm:ss] ") + html + "</font>";
 
-    if (optionalIsBold) {
+    if (optionalIsBold)
         htmlText = "<b>" + htmlText + "</b>";
-    }
 
     prepareBlock().insertHtml(htmlText);
-    if (atBottom) {
+    if (atBottom)
         verticalScrollBar()->setValue(verticalScrollBar()->maximum());
-    }
 }
 
 void ChatView::appendCardTag(QTextCursor &cursor, const QString &cardName)
@@ -185,9 +180,8 @@ void ChatView::appendCardTag(QTextCursor &cursor, const QString &cardName)
 
 void ChatView::appendUrlTag(QTextCursor &cursor, QString url)
 {
-    if (!url.contains("://")) {
+    if (!url.contains("://"))
         url.prepend("https://");
-    }
 
     QTextCharFormat oldFormat = cursor.charFormat();
     QTextCharFormat anchorFormat = oldFormat;
@@ -261,8 +255,7 @@ void ChatView::appendMessage(QString message,
     defaultFormat = QTextCharFormat();
     if (!isUserMessage) {
         if (messageType == Event_RoomSay::ChatHistory) {
-            //! \todo Remove hardcoded color.
-            defaultFormat.setForeground(Qt::gray);
+            defaultFormat.setForeground(Qt::gray); //! \todo hardcoded color
             defaultFormat.setFontWeight(QFont::Light);
             defaultFormat.setFontItalic(true);
             static const QRegularExpression userNameRegex("^(\\[[^\\]]*\\]\\s)(\\S+):\\s");
@@ -285,8 +278,7 @@ void ChatView::appendMessage(QString message,
                 message.remove(0, pos.relativePosition - 2); // do not remove semicolon
             }
         } else {
-            //! \todo Remove hardcoded color.
-            defaultFormat.setForeground(Qt::darkGreen);
+            defaultFormat.setForeground(Qt::darkGreen); //! \todo hardcoded color
             defaultFormat.setFontWeight(QFont::Bold);
         }
     }
@@ -325,9 +317,8 @@ void ChatView::appendMessage(QString message,
         }
     }
 
-    if (atBottom) {
+    if (atBottom)
         verticalScrollBar()->setValue(verticalScrollBar()->maximum());
-    }
 }
 
 void ChatView::checkTag(QTextCursor &cursor, QString &message)
@@ -336,11 +327,10 @@ 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;
@@ -350,11 +340,10 @@ 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;
@@ -364,11 +353,10 @@ 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;
@@ -599,9 +587,8 @@ 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();
 }
@@ -617,11 +604,10 @@ 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;
@@ -664,9 +650,8 @@ void ChatView::mousePressEvent(QMouseEvent *event)
                     case Qt::LeftButton: {
                         if (event->modifiers() == Qt::ControlModifier) {
                             emit openMessageDialog(userName, true);
-                        } else {
+                        } else
                             emit addMentionTag("@" + userName);
-                        }
                         break;
                     }
                     default:
@@ -683,18 +668,16 @@ 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() == "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 c5ae2b81a..d1939fbea 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
@@ -2,8 +2,8 @@
  * @file chat_view.h
  * @ingroup NetworkingWidgets
  * @ingroup Lobby
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef CHATVIEW_H
 #define CHATVIEW_H
diff --git a/cockatrice/src/interface/widgets/server/game_filter_configs.cpp b/cockatrice/src/interface/widgets/server/game_filter_configs.cpp
deleted file mode 100644
index 5a6282b75..000000000
--- a/cockatrice/src/interface/widgets/server/game_filter_configs.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
deleted file mode 100644
index 0ece7e00c..000000000
--- a/cockatrice/src/interface/widgets/server/game_filter_configs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef COCKATRICE_GAME_FILTER_CONFIGS_H
-#define COCKATRICE_GAME_FILTER_CONFIGS_H
-
-#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 creatorNameFilters = {};
-    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_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp
index 9a41ca6ce..f14cc6d82 100644
--- a/cockatrice/src/interface/widgets/server/game_selector.cpp
+++ b/cockatrice/src/interface/widgets/server/game_selector.cpp
@@ -37,9 +37,8 @@ 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);
@@ -61,17 +60,14 @@ 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);
 
@@ -95,7 +91,6 @@ GameSelector::GameSelector(AbstractClient *_client,
     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;
@@ -114,9 +109,8 @@ 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);
@@ -182,23 +176,27 @@ void GameSelector::actSetFilter()
 {
     DlgFilterGames dlg(gameTypeMap, gameListProxyModel, this);
 
-    if (!dlg.exec()) {
+    if (!dlg.exec())
         return;
-    }
 
-    gameListProxyModel->setGameFilters(dlg.getFilters());
+    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->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);
 
@@ -378,9 +376,8 @@ void GameSelector::joinGame(const bool asSpectator, const bool asJudge)
 
 void GameSelector::disableButtons()
 {
-    if (createButton) {
+    if (createButton)
         createButton->setEnabled(false);
-    }
 
     joinButton->setEnabled(false);
     spectateButton->setEnabled(false);
@@ -388,9 +385,8 @@ void GameSelector::disableButtons()
 
 void GameSelector::enableButtons()
 {
-    if (createButton) {
+    if (createButton)
         createButton->setEnabled(true);
-    }
 
     // Enable buttons for the currently selected game
     enableButtonsForIndex(gameListView->currentIndex());
@@ -398,9 +394,8 @@ 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();
@@ -413,9 +408,8 @@ 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 fa91e5f96..ea0a4feb0 100644
--- a/cockatrice/src/interface/widgets/server/game_selector.h
+++ b/cockatrice/src/interface/widgets/server/game_selector.h
@@ -40,7 +40,6 @@ 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.
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 d668b1c33..daab4d6eb 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
@@ -18,31 +18,33 @@ GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
     mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->setSpacing(5);
 
-    const GameFilterConfigs &filters = model->getFilters();
-
     searchBar = new QLineEdit(this);
-    searchBar->setText(filters.gameNameFilter);
-    connect(searchBar, &QLineEdit::textChanged, this, [this](const QString &text) {
-        applyFilters([&](GameFilterConfigs &configs) { configs.gameNameFilter = text; });
-    });
+    searchBar->setText(model->getCreatorNameFilters().join(", "));
+    connect(searchBar, &QLineEdit::textChanged, this, [this](const QString &text) { model->setGameNameFilter(text); });
 
     hideGamesNotCreatedByBuddiesCheckBox = new QCheckBox(this);
-    hideGamesNotCreatedByBuddiesCheckBox->setChecked(filters.hideNotBuddyCreatedGames);
+    hideGamesNotCreatedByBuddiesCheckBox->setChecked(model->getHideBuddiesOnlyGames());
     connect(hideGamesNotCreatedByBuddiesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
-        applyFilters([&](GameFilterConfigs &configs) { configs.hideNotBuddyCreatedGames = checked; });
+        if (checked) {
+            QStringList buddyNames;
+            for (auto buddy : tabSupervisor->getUserListManager()->getBuddyList().values()) {
+                buddyNames << QString::fromStdString(buddy.name());
+            }
+            model->setCreatorNameFilters(buddyNames);
+        } else {
+            model->setCreatorNameFilters({});
+        }
     });
 
     hideFullGamesCheckBox = new QCheckBox(this);
-    hideFullGamesCheckBox->setChecked(filters.hideFullGames);
-    connect(hideFullGamesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
-        applyFilters([&](GameFilterConfigs &configs) { configs.hideFullGames = checked; });
-    });
+    hideFullGamesCheckBox->setChecked(model->getHideFullGames());
+    connect(hideFullGamesCheckBox, &QCheckBox::toggled, this,
+            [this](bool checked) { model->setHideFullGames(checked); });
 
     hideStartedGamesCheckBox = new QCheckBox(this);
-    hideStartedGamesCheckBox->setChecked(filters.hideGamesThatStarted);
-    connect(hideStartedGamesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
-        applyFilters([&](GameFilterConfigs &configs) { configs.hideGamesThatStarted = checked; });
-    });
+    hideStartedGamesCheckBox->setChecked(model->getHideGamesThatStarted());
+    connect(hideStartedGamesCheckBox, &QCheckBox::toggled, this,
+            [this](bool checked) { model->setHideGamesThatStarted(checked); });
 
     filterToFormatComboBox = new QComboBox(this);
 
@@ -55,27 +57,25 @@ GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
         filterToFormatComboBox->addItem(i.value(), i.key()); // text = name, data = type ID
     }
 
-    QSet<int> currentTypes = filters.gameTypeFilter;
+    QSet<int> currentTypes = model->getGameTypeFilter();
     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) {
-        applyFilters([&](GameFilterConfigs &configs) {
-            QVariant data = filterToFormatComboBox->itemData(index);
-            if (!data.isValid()) {
-                configs.gameTypeFilter.clear();
-            } else {
-                configs.gameTypeFilter = {data.toInt()};
-            }
-        });
+        QVariant data = filterToFormatComboBox->itemData(index);
+        if (!data.isValid()) {
+            model->setGameTypeFilter({}); // empty = no filter
+        } else {
+            int typeId = data.toInt();
+            model->setGameTypeFilter({typeId});
+        }
     });
 
     hideGamesNotCreatedByBuddiesCheckBox->setMinimumSize(20, 20);
@@ -96,47 +96,9 @@ 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 9b7b6e61f..642fdd1c4 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
@@ -18,8 +18,6 @@ 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 1d30aa7ac..05d363fee 100644
--- a/cockatrice/src/interface/widgets/server/games_model.cpp
+++ b/cockatrice/src/interface/widgets/server/games_model.cpp
@@ -23,6 +23,10 @@ enum GameListColumn
     SPECTATORS
 };
 
+const int DEFAULT_MAX_PLAYERS_MIN = 1;
+const int DEFAULT_MAX_PLAYERS_MAX = 99;
+constexpr auto DEFAULT_MAX_GAME_AGE = QTime();
+
 const QString GamesModel::getGameCreatedString(const int secs)
 {
     static const QTime zeroTime{0, 0};
@@ -63,18 +67,14 @@ 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()) {
@@ -130,9 +130,8 @@ 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:
@@ -145,18 +144,14 @@ 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: {
@@ -214,9 +209,8 @@ 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");
@@ -289,26 +283,56 @@ GamesProxyModel::GamesProxyModel(QObject *parent, const UserListProxy *_userList
     setDynamicSortFilter(true);
 }
 
-void GamesProxyModel::setGameFilters(const GameFilterConfigs &_filters)
+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)
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0))
     beginFilterChange();
 #endif
-    filters = _filters;
+    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;
 #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) {
@@ -321,12 +345,18 @@ int GamesProxyModel::getNumFilteredGames() const
 
 void GamesProxyModel::resetFilterParameters()
 {
-    setGameFilters({});
+    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);
 }
 
 bool GamesProxyModel::areFilterParametersSetToDefaults() const
 {
-    return filters.isDefault();
+    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;
 }
 
 void GamesProxyModel::loadFilterParameters(const QMap<int, QString> &allGameTypes)
@@ -342,44 +372,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.getCreatorNameFilters(), 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(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.setCreatorNameFilters(filters.creatorNameFilters);
+    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);
 
     QMapIterator<int, QString> gameTypeIterator(allGameTypes);
     while (gameTypeIterator.hasNext()) {
         gameTypeIterator.next();
-        bool enabled = filters.gameTypeFilter.contains(gameTypeIterator.key());
+        bool enabled = gameTypeFilter.contains(gameTypeIterator.key());
         gameFilters.setGameTypeEnabled(gameTypeIterator.value(), enabled);
     }
 
-    gameFilters.setMinPlayers(filters.maxPlayersFilterMin);
-    gameFilters.setMaxPlayers(filters.maxPlayersFilterMax);
-    gameFilters.setMaxGameAge(filters.maxGameAge);
+    gameFilters.setMinPlayers(maxPlayersFilterMin);
+    gameFilters.setMaxPlayers(maxPlayersFilterMax);
+    gameFilters.setMaxGameAge(maxGameAge);
 
-    gameFilters.setShowOnlyIfSpectatorsCanWatch(filters.showOnlyIfSpectatorsCanWatch);
-    gameFilters.setShowSpectatorPasswordProtected(filters.showSpectatorPasswordProtected);
-    gameFilters.setShowOnlyIfSpectatorsCanChat(filters.showOnlyIfSpectatorsCanChat);
-    gameFilters.setShowOnlyIfSpectatorsCanSeeHands(filters.showOnlyIfSpectatorsCanSeeHands);
+    gameFilters.setShowOnlyIfSpectatorsCanWatch(showOnlyIfSpectatorsCanWatch);
+    gameFilters.setShowSpectatorPasswordProtected(showSpectatorPasswordProtected);
+    gameFilters.setShowOnlyIfSpectatorsCanChat(showOnlyIfSpectatorsCanChat);
+    gameFilters.setShowOnlyIfSpectatorsCanSeeHands(showOnlyIfSpectatorsCanSeeHands);
 }
 
 bool GamesProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex & /*sourceParent*/) const
@@ -395,48 +425,38 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const
     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 (filters.hideBuddiesOnlyGames && game.only_buddies()) {
+    if (hideBuddiesOnlyGames && game.only_buddies()) {
         return false;
     }
-    if (filters.hideOpenDecklistGames && game.share_decklists_on_load()) {
+    if (hideOpenDecklistGames && game.share_decklists_on_load()) {
         return false;
     }
-    if (filters.hideIgnoredUserGames &&
-        userListProxy->isUserIgnored(QString::fromStdString(game.creator_info().name()))) {
+    if (hideIgnoredUserGames && userListProxy->isUserIgnored(QString::fromStdString(game.creator_info().name()))) {
         return false;
     }
-    if (filters.hideNotBuddyCreatedGames &&
-        !userListProxy->isUserBuddy(QString::fromStdString(game.creator_info().name()))) {
+    if (hideNotBuddyCreatedGames && !userListProxy->isUserBuddy(QString::fromStdString(game.creator_info().name()))) {
         return false;
     }
-    if (filters.hideFullGames && game.player_count() == game.max_players()) {
+    if (hideFullGames && game.player_count() == game.max_players())
         return false;
-    }
-    if (filters.hideGamesThatStarted && game.started()) {
+    if (hideGamesThatStarted && game.started())
         return false;
-    }
-    if (!userListProxy->isOwnUserRegistered()) {
-        if (game.only_registered()) {
+    if (!userListProxy->isOwnUserRegistered())
+        if (game.only_registered())
             return false;
-        }
-    }
-    if (filters.hidePasswordProtectedGames && game.with_password()) {
+    if (hidePasswordProtectedGames && game.with_password())
         return false;
-    }
-    if (!filters.gameNameFilter.isEmpty()) {
-        if (!QString::fromStdString(game.description()).contains(filters.gameNameFilter, Qt::CaseInsensitive)) {
+    if (!gameNameFilter.isEmpty())
+        if (!QString::fromStdString(game.description()).contains(gameNameFilter, Qt::CaseInsensitive))
             return false;
-        }
-    }
-    if (!filters.creatorNameFilters.isEmpty()) {
+    if (!creatorNameFilters.isEmpty()) {
         bool found = false;
-        for (const auto &createNameFilter : filters.creatorNameFilters) {
+        for (const auto &createNameFilter : creatorNameFilters) {
             if (QString::fromStdString(game.creator_info().name()).contains(createNameFilter, Qt::CaseInsensitive)) {
                 found = true;
             }
@@ -447,45 +467,36 @@ 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 (!filters.gameTypeFilter.isEmpty() && gameTypes.intersect(filters.gameTypeFilter).isEmpty()) {
+    if (!gameTypeFilter.isEmpty() && gameTypes.intersect(gameTypeFilter).isEmpty())
         return false;
-    }
 
-    if (static_cast<int>(game.max_players()) < filters.maxPlayersFilterMin) {
+    if (game.max_players() < maxPlayersFilterMin)
         return false;
-    }
-    if (static_cast<int>(game.max_players()) > filters.maxPlayersFilterMax) {
+    if (game.max_players() > maxPlayersFilterMax)
         return false;
-    }
 
-    if (filters.maxGameAge.isValid()) {
+    if (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() > filters.maxGameAge)) {
+        if (total.isValid() && total.date() >= epochDate && (total.date() > epochDate || total.time() > maxGameAge)) {
             return false;
         }
     }
 
-    if (filters.showOnlyIfSpectatorsCanWatch) {
-        if (!game.spectators_allowed()) {
+    if (showOnlyIfSpectatorsCanWatch) {
+        if (!game.spectators_allowed())
             return false;
-        }
-        if (!filters.showSpectatorPasswordProtected && game.spectators_need_password()) {
+        if (!showSpectatorPasswordProtected && game.spectators_need_password())
             return false;
-        }
-        if (filters.showOnlyIfSpectatorsCanChat && !game.spectators_can_chat()) {
+        if (showOnlyIfSpectatorsCanChat && !game.spectators_can_chat())
             return false;
-        }
-        if (filters.showOnlyIfSpectatorsCanSeeHands && !game.spectators_omniscient()) {
+        if (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 b5f86c291..56c806fb6 100644
--- a/cockatrice/src/interface/widgets/server/games_model.h
+++ b/cockatrice/src/interface/widgets/server/games_model.h
@@ -1,7 +1,6 @@
 #ifndef GAMESMODEL_H
 #define GAMESMODEL_H
 
-#include "game_filter_configs.h"
 #include "game_type_map.h"
 
 #include <QList>
@@ -122,10 +121,22 @@ private:
     // - loadFilterParameters()
     // - saveFilterParameters()
     // - filterAcceptsRow()
-    GameFilterConfigs filters;
-
-signals:
-    void filtersChanged();
+    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;
 
 public:
     /**
@@ -136,15 +147,182 @@ public:
     explicit GamesProxyModel(QObject *parent = nullptr, const UserListProxy *_userListProxy = nullptr);
 
     // Getters for filter parameters
-    [[nodiscard]] const GameFilterConfigs &getFilters() const
+    [[nodiscard]] bool getHideBuddiesOnlyGames() const
     {
-        return filters;
+        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;
     }
 
     /**
      * @brief Sets all game filters at once.
      */
-    void setGameFilters(const GameFilterConfigs &_filters);
+    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();
+    }
 
     /**
      * @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 8ebb70e83..f37c957a4 100644
--- a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
+++ b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
@@ -37,11 +37,13 @@ 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 fa924b183..f06bb3ff6 100644
--- a/cockatrice/src/interface/widgets/server/handle_public_servers.h
+++ b/cockatrice/src/interface/widgets/server/handle_public_servers.h
@@ -1,8 +1,8 @@
 /**
  * @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
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 a6add3fca..6ca680c3f 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
@@ -22,9 +22,8 @@ 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();
 }
 
@@ -32,37 +31,31 @@ 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;
 }
@@ -73,14 +66,12 @@ 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;
@@ -104,11 +95,10 @@ 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
@@ -118,12 +108,10 @@ int RemoteDeckList_TreeModel::columnCount(const QModelIndex & /*parent*/) const
 
 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() >= 3)
         return QVariant();
-    }
 
     Node *temp = static_cast<Node *>(index.internalPointer());
     FileNode *file = dynamic_cast<FileNode *>(temp);
@@ -169,9 +157,8 @@ 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;
@@ -194,23 +181,20 @@ 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());
 }
@@ -226,9 +210,8 @@ 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);
 }
 
@@ -250,11 +233,10 @@ void RemoteDeckList_TreeModel::addFolderToTree(const ServerInfo_DeckStorage_Tree
     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);
-        }
     }
 }
 
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 3dd91d7a4..8254eb57b 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,8 +2,8 @@
  * @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
@@ -75,9 +75,8 @@ 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()));
     }
 
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 1f034b767..5152880d9 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
@@ -14,16 +14,14 @@ 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)
@@ -47,26 +45,22 @@ 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) {
@@ -109,9 +103,8 @@ 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:
@@ -138,9 +131,8 @@ 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) {
@@ -175,20 +167,17 @@ 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]);
     }
 }
@@ -196,9 +185,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());
     }
@@ -206,52 +195,45 @@ 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();
@@ -262,9 +244,8 @@ 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();
 }
 
@@ -294,26 +275,24 @@ 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)
@@ -323,9 +302,8 @@ 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 10e698aee..6d81aefca 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,8 +3,8 @@
  * @ingroup DeckStorageWidgets
  * @ingroup Replays
  * @ingroup NetworkingWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef REMOTEREPLAYLIST_TREEWIDGET_H
 #define REMOTEREPLAYLIST_TREEWIDGET_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 195b1cc8d..7083ac899 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
@@ -192,15 +192,13 @@ 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)
@@ -230,15 +228,13 @@ 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)
@@ -301,9 +297,8 @@ 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());
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 b0ff89816..0056d74ae 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.h
+++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.h
@@ -1,8 +1,8 @@
 /**
  * @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
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 e41ae6e75..9ae4a42c2 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
@@ -85,15 +85,24 @@ void UserInfoBox::retranslateUi()
     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()));
+}
+
 void UserInfoBox::updateInfo(const ServerInfo_User &user)
 {
-    userLevel = UserLevelFlags(user.user_level());
-    pawnColors = user.pawn_colors();
-    privLevel = QString::fromStdString(user.privlevel());
+    currentUserInfo = &user;
+
+    const UserLevelFlags userLevel(user.user_level());
 
     const std::string &bmp = user.avatar_bmp();
     if (!avatarPixmap.loadFromData((const uchar *)bmp.data(), static_cast<uint>(bmp.size()))) {
-        avatarPixmap = UserLevelPixmapGenerator::generatePixmap(64, userLevel, pawnColors, false, privLevel);
+        avatarPixmap = createDefaultAvatar(64, user);
         hasAvatar = false;
     } else {
         hasAvatar = true;
@@ -111,21 +120,20 @@ void UserInfoBox::updateInfo(const ServerInfo_User &user)
         countryLabel3.setText("");
     }
 
-    userLevelIcon.setPixmap(UserLevelPixmapGenerator::generatePixmap(15, userLevel, pawnColors, false, privLevel));
+    userLevelIcon.setPixmap(UserLevelPixmapGenerator::generatePixmap(15, userLevel, user.pawn_colors(), false,
+                                                                     QString::fromStdString(user.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::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());
@@ -144,17 +152,15 @@ 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();
@@ -212,9 +218,8 @@ 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());
@@ -226,9 +231,8 @@ 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
@@ -246,9 +250,8 @@ 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();
@@ -293,9 +296,8 @@ 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());
@@ -363,7 +365,7 @@ void UserInfoBox::processAvatarResponse(const Response &r)
             break;
         case Response::RespInternalError:
         default:
-            QMessageBox::critical(this, tr("Error"), tr("An error occured while trying to update your avatar."));
+            QMessageBox::critical(this, tr("Error"), tr("An error occured while trying to updater your avatar."));
             break;
     }
 }
@@ -375,7 +377,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 = UserLevelPixmapGenerator::generatePixmap(height, userLevel, pawnColors, false, privLevel);
+        resizedPixmap = createDefaultAvatar(height, *currentUserInfo);
     }
     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 055ac0096..d3d926bed 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_box.h
@@ -1,8 +1,8 @@
 /**
  * @file user_info_box.h
  * @ingroup Lobby
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef USERINFOBOX_H
 #define USERINFOBOX_H
@@ -11,9 +11,8 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QWidget>
-#include <libcockatrice/network/server/remote/user_level.h>
-#include <libcockatrice/utility/days_years_between.h>
 
+class ServerInfo_User;
 class AbstractClient;
 class Response;
 
@@ -28,15 +27,20 @@ private:
     QPushButton editButton, passwordButton, avatarButton;
     QPixmap avatarPixmap;
     bool hasAvatar;
-    UserLevelFlags userLevel;
-    ServerInfo_User::PawnColorsOverride pawnColors;
-    QString privLevel;
+    const ServerInfo_User *currentUserInfo;
 
     static QString getAgeString(int ageSeconds);
 
 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);
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 919bc2707..069e438a9 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
@@ -53,9 +53,8 @@ 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();
@@ -74,9 +73,8 @@ 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 6278815a9..cfba22346 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.h
@@ -1,8 +1,8 @@
 /**
  * @file user_info_connection.h
  * @ingroup Client
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef USERCONNECTION_INFORMATION_H
 #define USERCONNECTION_INFORMATION_H
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_manager.h b/cockatrice/src/interface/widgets/server/user/user_list_manager.h
index f09284bd0..f378bd08d 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
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 626f89b8f..bff76077f 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 11c9b60eb..852743479 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
@@ -40,9 +40,8 @@ BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(par
     idBanCheckBox->setChecked(true);
     idBanEdit = new QLineEdit(QString::fromStdString(info.clientid()));
     idBanEdit->setMaxLength(MAX_NAME_LENGTH);
-    if (QString::fromStdString(info.clientid()).isEmpty()) {
+    if (QString::fromStdString(info.clientid()).isEmpty())
         idBanCheckBox->setChecked(false);
-    }
 
     QGridLayout *banTypeGrid = new QGridLayout;
     banTypeGrid->addWidget(nameBanCheckBox, 0, 0);
@@ -208,30 +207,27 @@ void BanDialog::okClicked()
         return;
     }
 
-    if (nameBanCheckBox->isChecked()) {
+    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 (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 (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();
 }
@@ -465,15 +461,14 @@ void UserListWidget::processUserInfo(const ServerInfo_User &user, bool online)
 {
     const QString userName = QString::fromStdString(user.name());
     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();
     }
     item->setOnline(online);
@@ -485,9 +480,8 @@ bool UserListWidget::deleteUser(const QString &userName)
     if (twi) {
         users.remove(userName);
         userTree->takeTopLevelItem(userTree->indexOfTopLevelItem(twi));
-        if (twi->data(0, Qt::UserRole + 1).toBool()) {
+        if (twi->data(0, Qt::UserRole + 1).toBool())
             --onlineCount;
-        }
         delete twi;
         updateCount();
         return true;
@@ -499,25 +493,22 @@ bool UserListWidget::deleteUser(const QString &userName)
 void UserListWidget::setUserOnline(const QString &userName, bool online)
 {
     UserListTWI *twi = users.value(userName);
-    if (!twi) {
+    if (!twi)
         return;
-    }
 
     twi->setOnline(online);
-    if (online) {
+    if (online)
         ++onlineCount;
-    } else {
+    else
         --onlineCount;
-    }
     updateCount();
 }
 
 void UserListWidget::updateCount()
 {
     QString str = titleStr;
-    if ((type == BuddyList) || (type == IgnoreList)) {
+    if ((type == BuddyList) || (type == IgnoreList))
         str = str.arg(onlineCount);
-    }
     setTitle(str.arg(userTree->topLevelItemCount()));
 }
 
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 5a8c00d10..036837673 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.h
@@ -1,8 +1,8 @@
 /**
  * @file user_list_widget.h
  * @ingroup Lobby
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef USERLIST_H
 #define USERLIST_H
diff --git a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h
deleted file mode 100644
index 4cbf2d71a..000000000
--- a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef COCKATRICE_ABSTRACT_SETTINGS_PAGE_H
-#define COCKATRICE_ABSTRACT_SETTINGS_PAGE_H
-
-#include <QWidget>
-
-#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"
-
-class AbstractSettingsPage : public QWidget
-{
-public:
-    virtual void retranslateUi() = 0;
-};
-
-#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
deleted file mode 100644
index 2d32f3ce1..000000000
--- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-#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 "../dialogs/override_printing_warning.h"
-#include "../interface/theme_manager.h"
-#include "../interface/widgets/general/background_sources.h"
-
-#include <QColorDialog>
-#include <QDesktopServices>
-#include <QGridLayout>
-#include <QMessageBox>
-#include <QTimer>
-
-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()); });
-
-    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);
-    });
-
-    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(&editPaletteButton, 3, 1);
-
-    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 = 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));
-        updateHomeTabSettingsVisibility();
-    });
-
-    homeTabBackgroundShuffleFrequencySpinBox.setRange(0, 3600);
-    homeTabBackgroundShuffleFrequencySpinBox.setSuffix(tr(" seconds"));
-    homeTabBackgroundShuffleFrequencySpinBox.setValue(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency());
-    connect(&homeTabBackgroundShuffleFrequencySpinBox, qOverload<int>(&QSpinBox::valueChanged),
-            &SettingsCache::instance(), &SettingsCache::setHomeTabBackgroundShuffleFrequency);
-
-    homeTabDisplayCardNameCheckBox.setChecked(settings.getHomeTabDisplayCardName());
-    connect(&homeTabDisplayCardNameCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
-            &SettingsCache::setHomeTabDisplayCardName);
-
-    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);
-
-    homeTabGroupBox = new QGroupBox;
-    homeTabGroupBox->setLayout(homeTabGrid);
-
-    // Menu settings
-    showShortcutsCheckBox.setChecked(settings.getShowShortcuts());
-    connect(&showShortcutsCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &AppearanceSettingsPage::showShortcutsChanged);
-
-    showGameSelectorFilterToolbarCheckBox.setChecked(settings.getShowGameSelectorFilterToolbar());
-    connect(&showGameSelectorFilterToolbarCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
-            &SettingsCache::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.getOverrideAllCardArtWithPersonalPreference());
-    connect(&overrideAllCardArtWithPersonalPreferenceCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
-            &AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled);
-
-    bumpSetsWithCardsInDeckToTopCheckBox.setChecked(settings.getBumpSetsWithCardsInDeckToTop());
-    connect(&bumpSetsWithCardsInDeckToTopCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
-            &SettingsCache::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.getDisplayCardNames());
-    connect(&displayCardNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setDisplayCardNames);
-
-    autoRotateSidewaysLayoutCardsCheckBox.setChecked(settings.getAutoRotateSidewaysLayoutCards());
-    connect(&autoRotateSidewaysLayoutCardsCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
-            &SettingsCache::setAutoRotateSidewaysLayoutCards);
-
-    cardScalingCheckBox.setChecked(settings.getScaleCards());
-    connect(&cardScalingCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setCardScaling);
-
-    roundCardCornersCheckBox.setChecked(settings.getRoundCardCorners());
-    connect(&roundCardCornersCheckBox, &QAbstractButton::toggled, &settings, &SettingsCache::setRoundCardCorners);
-
-    connect(&maxFontSizeForCardsEdit, qOverload<int>(&QSpinBox::valueChanged), &settings,
-            &SettingsCache::setMaxFontSize);
-    maxFontSizeForCardsEdit.setValue(settings.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.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 *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.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);
-
-    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(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(), &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::editPalette()
-{
-    PaletteEditorDialog dlg(themeManager->getCurrentThemePath(), SettingsCache::instance().getThemeName(), this);
-    dlg.exec();
-}
-
-void AppearanceSettingsPage::updateHomeTabSettingsVisibility()
-{
-    bool visible =
-        SettingsCache::instance().getHomeTabBackgroundSource() != BackgroundSources::toId(BackgroundSources::Theme);
-
-    homeTabBackgroundShuffleFrequencyLabel.setVisible(visible);
-    homeTabBackgroundShuffleFrequencySpinBox.setVisible(visible);
-    homeTabDisplayCardNameCheckBox.setVisible(visible);
-}
-
-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);
-
-    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().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"));
-    schemeComboLabel.setText(tr("Active theme palette:"));
-    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"));
-
-    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:"));
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
deleted file mode 100644
index 9ed27be4d..000000000
--- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef COCKATRICE_APPEARANCE_SETTINGS_PAGE_H
-#define COCKATRICE_APPEARANCE_SETTINGS_PAGE_H
-
-#include "abstract_settings_page.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QSpinBox>
-#include <libcockatrice/utility/macros.h>
-
-class AppearanceSettingsPage : public AbstractSettingsPage
-{
-    Q_OBJECT
-private slots:
-    void themeBoxChanged(int index);
-    void openThemeLocation();
-    void editPalette();
-    void updateHomeTabSettingsVisibility();
-    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 schemeComboLabel;
-    QComboBox schemeCombo;
-    QPushButton editPaletteButton;
-    QLabel homeTabBackgroundSourceLabel;
-    QComboBox homeTabBackgroundSourceBox;
-    QLabel homeTabBackgroundShuffleFrequencyLabel;
-    QSpinBox homeTabBackgroundShuffleFrequencySpinBox;
-    QCheckBox homeTabDisplayCardNameCheckBox;
-    QLabel minPlayersForMultiColumnLayoutLabel;
-    QLabel maxFontSizeForCardsLabel;
-    QCheckBox showShortcutsCheckBox;
-    QCheckBox showGameSelectorFilterToolbarCheckBox;
-    QCheckBox overrideAllCardArtWithPersonalPreferenceCheckBox;
-    QCheckBox bumpSetsWithCardsInDeckToTopCheckBox;
-    QCheckBox displayCardNamesCheckBox;
-    QCheckBox autoRotateSidewaysLayoutCardsCheckBox;
-    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 *homeTabGroupBox;
-    QGroupBox *menuGroupBox;
-    QGroupBox *printingsGroupBox;
-    QGroupBox *cardsGroupBox;
-    QGroupBox *cardLayoutGroupBox;
-    QGroupBox *handGroupBox;
-    QGroupBox *tableGroupBox;
-    QGroupBox *cardCountersGroupBox;
-    QList<QLabel *> cardCounterNames;
-    QSpinBox minPlayersForMultiColumnLayoutEdit;
-    QSpinBox maxFontSizeForCardsEdit;
-
-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
deleted file mode 100644
index b7d699ebc..000000000
--- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-#include "deck_editor_settings_page.h"
-
-#include "../../../client/settings/cache_settings.h"
-#include "update/card_spoiler/spoiler_background_updater.h"
-
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QHBoxLayout>
-#include <QInputDialog>
-#include <QLineEdit>
-#include <QMessageBox>
-#include <QToolBar>
-
-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(&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);
-
-    // 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(),
-            &SettingsCache::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(), &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::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")));
-    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"));
-}
\ No newline at end of file
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
deleted file mode 100644
index 5db009c8a..000000000
--- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H
-#define COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H
-
-#include "abstract_settings_page.h"
-
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QListWidget>
-#include <QPushButton>
-
-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 resetDownloadedURLsButtonClicked();
-
-private:
-    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;
-};
-
-#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
deleted file mode 100644
index 9faf67578..000000000
--- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-#include "general_settings_page.h"
-
-#include "../../../client/settings/cache_settings.h"
-#include "../main.h"
-#include "update/client/release_channel.h"
-
-#include <QCoreApplication>
-#include <QFileDialog>
-#include <QGridLayout>
-#include <QLineEdit>
-#include <QTranslator>
-
-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);
-
-    auto *languageGrid = new QGridLayout;
-    languageGrid->addWidget(&languageLabel, 0, 0);
-    languageGrid->addWidget(&languageBox, 0, 1);
-    languageGrid->addWidget(&advertiseTranslationPageLabel, 1, 1, Qt::AlignRight);
-
-    languageGroupBox = new QGroupBox;
-    languageGroupBox->setLayout(languageGrid);
-
-    // version settings
-    SettingsCache &settings = SettingsCache::instance();
-    startupUpdateCheckCheckBox.setChecked(settings.getCheckUpdatesOnStartup());
-
-    connect(&startupUpdateCheckCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
-            &SettingsCache::setCheckUpdatesOnStartup);
-
-    updateNotificationCheckBox.setChecked(settings.getNotifyAboutUpdates());
-
-    connect(&updateNotificationCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setNotifyAboutUpdate);
-
-    connect(&newVersionOracleCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
-            &SettingsCache::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().getStartupCardUpdateCheckPromptForUpdate()) {
-        startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexPrompt);
-    } else if (SettingsCache::instance().getStartupCardUpdateCheckAlwaysUpdate()) {
-        startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexAlways);
-    } else {
-        startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexNone);
-    }
-
-    connect(&startupCardUpdateCheckBehaviorSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-            [](int index) {
-                SettingsCache::instance().setStartupCardUpdateCheckPromptForUpdate(
-                    index == startupCardUpdateCheckBehaviorIndexPrompt);
-                SettingsCache::instance().setStartupCardUpdateCheckAlwaysUpdate(
-                    index == startupCardUpdateCheckBehaviorIndexAlways);
-            });
-
-    cardUpdateCheckIntervalSpinBox.setMinimum(1);
-    cardUpdateCheckIntervalSpinBox.setMaximum(30);
-    cardUpdateCheckIntervalSpinBox.setValue(settings.getCardUpdateCheckInterval());
-
-    connect(&cardUpdateCheckIntervalSpinBox, qOverload<int>(&QSpinBox::valueChanged), &settings,
-            &SettingsCache::setCardUpdateCheckInterval);
-
-    newVersionOracleCheckBox.setChecked(settings.getNotifyAboutNewVersion());
-
-    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);
-
-    cardDatabaseGroupBox = new QGroupBox;
-    cardDatabaseGroupBox->setLayout(cardDatabaseGrid);
-
-    // startup settings
-    showTipsOnStartup.setChecked(settings.getShowTipsOnStartup());
-
-    connect(&showTipsOnStartup, &QCheckBox::clicked, &settings, &SettingsCache::setShowTipsOnStartup);
-
-    auto *startupGrid = new QGridLayout;
-    startupGrid->addWidget(&showTipsOnStartup, 0, 0, 1, 2);
-
-    startupGroupBox = new QGroupBox;
-    startupGroupBox->setLayout(startupGrid);
-
-    // paths settings
-    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(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,
-            &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(GeneralSettingsPageLog)
-            << "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()
-{
-    languageGroupBox->setTitle(tr("Language settings"));
-    languageLabel.setText(tr("Language:"));
-
-    versionGroupBox->setTitle(tr("Version settings"));
-    cardDatabaseGroupBox->setTitle(tr("Card database"));
-    startupGroupBox->setTitle(tr("Startup settings"));
-
-    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);
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
deleted file mode 100644
index 8aa39ff65..000000000
--- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef COCKATRICE_GENERAL_SETTINGS_PAGE_H
-#define COCKATRICE_GENERAL_SETTINGS_PAGE_H
-
-#include "abstract_settings_page.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QLoggingCategory>
-#include <QPushButton>
-#include <QSpinBox>
-
-inline Q_LOGGING_CATEGORY(GeneralSettingsPageLog, "general_settings_page");
-
-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);
-
-    QGroupBox *languageGroupBox;
-    QGroupBox *versionGroupBox;
-    QGroupBox *cardDatabaseGroupBox;
-    QGroupBox *startupGroupBox;
-    QGroupBox *pathsGroupBox;
-
-    QLineEdit *deckPathEdit;
-    QLineEdit *filtersPathEdit;
-    QLineEdit *replaysPathEdit;
-    QLineEdit *picsPathEdit;
-    QLineEdit *cardDatabasePathEdit;
-    QLineEdit *customCardDatabasePathEdit;
-    QLineEdit *tokenDatabasePathEdit;
-    QPushButton *resetAllPathsButton;
-    QLabel *allPathsResetLabel;
-    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;
-};
-
-#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
deleted file mode 100644
index 1e6f99245..000000000
--- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-#include "messages_settings_page.h"
-
-#include "../../../client/settings/cache_settings.h"
-#include "../interface/widgets/utility/get_text_with_max.h"
-
-#include <QGridLayout>
-#include <QLineEdit>
-#include <QToolBar>
-
-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());
-    ignoreNonBuddyUserMessages.setChecked(SettingsCache::instance().getIgnoreNonBuddyUserMessages());
-
-    connect(&ignoreUnregUsersMainChat, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setIgnoreUnregisteredUsers);
-    connect(&ignoreUnregUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setIgnoreUnregisteredUserMessages);
-    connect(&ignoreNonBuddyUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setIgnoreNonBuddyUserMessages);
-
-    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(&ignoreNonBuddyUserMessages, 4, 0);
-    chatGrid->addWidget(&messagePopups, 5, 0);
-    chatGrid->addWidget(&mentionPopups, 6, 0);
-    chatGrid->addWidget(&roomHistory, 7, 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"));
-    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"));
-    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
deleted file mode 100644
index e98ae0592..000000000
--- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef COCKATRICE_MESSAGES_SETTINGS_PAGE_H
-#define COCKATRICE_MESSAGES_SETTINGS_PAGE_H
-
-#include "abstract_settings_page.h"
-
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QListWidget>
-#include <libcockatrice/utility/macros.h>
-
-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;
-    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/shortcut_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
deleted file mode 100644
index e7a04ef79..000000000
--- a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#include "shortcut_settings_page.h"
-
-#include "../../../client/settings/cache_settings.h"
-#include "../../../client/settings/shortcut_treeview.h"
-#include "../interface/widgets/utility/custom_line_edit.h"
-#include "../interface/widgets/utility/sequence_edit.h"
-
-#include <QAbstractItemView>
-#include <QMessageBox>
-
-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"));
-}
diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h
deleted file mode 100644
index 05391df77..000000000
--- a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef COCKATRICE_SHORTCUT_SETTINGS_PAGE_H
-#define COCKATRICE_SHORTCUT_SETTINGS_PAGE_H
-
-#include "abstract_settings_page.h"
-
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-
-class SequenceEdit;
-class ShortcutTreeView;
-class SearchLineEdit;
-
-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
deleted file mode 100644
index e7e92ea15..000000000
--- a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-#include "sound_settings_page.h"
-
-#include "../../../client/settings/cache_settings.h"
-#include "../client/sound_engine.h"
-
-#include <QGridLayout>
-
-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"));
-}
\ 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
deleted file mode 100644
index f90bcbc5a..000000000
--- a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef COCKATRICE_SOUND_SETTINGS_PAGE_H
-#define COCKATRICE_SOUND_SETTINGS_PAGE_H
-
-#include "abstract_settings_page.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <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
deleted file mode 100644
index c9d3c7789..000000000
--- a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-#include "storage_settings_page.h"
-
-#include "../../../client/settings/cache_settings.h"
-#include "../interface/card_picture_loader/card_picture_loader.h"
-
-#include <QDir>
-#include <QGridLayout>
-#include <QMessageBox>
-
-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().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().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().setCardImageCacheMethod(cacheMethod);
-            });
-
-    // Network Cache
-
-    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());
-
-    // 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().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().setLocalCardImageStorageNamingScheme(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(),
-            &SettingsCache::setPixmapCacheSize);
-    connect(&networkCacheEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
-            &SettingsCache::setNetworkCacheSizeInMB);
-    connect(&networkRedirectCacheTtlEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
-            &SettingsCache::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 = SettingsCache::instance().getCardPictureLoaderCacheMethod() ==
-                           CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE;
-
-    mpNetworkCacheGroupBox->setEnabled(useNetworkCache);
-    mpImageBackupGroupBox->setEnabled(!useNetworkCache);
-
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &StorageSettingsPage::retranslateUi);
-    retranslateUi();
-}
-
-void StorageSettingsPage::clearDownloadedPicsButtonClicked()
-{
-    CardPictureLoader::clearNetworkCache();
-    CardPictureLoader::clearPixmapCache();
-    QMessageBox::information(this, tr("Success"), tr("Cached card pictures have been reset."));
-}
-
-void StorageSettingsPage::clearImageBackupsButtonClicked()
-{
-    QString picsPath = SettingsCache::instance().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
deleted file mode 100644
index 5c8a00981..000000000
--- a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef COCKATRICE_STORAGE_SETTINGS_PAGE_H
-#define COCKATRICE_STORAGE_SETTINGS_PAGE_H
-
-#include "abstract_settings_page.h"
-
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QSpinBox>
-
-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
deleted file mode 100644
index dfa736a1a..000000000
--- a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-#include "user_interface_settings_page.h"
-
-#include "../../../client/settings/cache_settings.h"
-#include "../interface/widgets/tabs/tab_supervisor.h"
-
-#include <QGridLayout>
-
-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);
-
-    showDragSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowDragSelectionCount());
-    connect(&showDragSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setShowDragSelectionCount);
-
-    showTotalSelectionCountCheckBox.setChecked(SettingsCache::instance().getShowTotalSelectionCount());
-    connect(&showTotalSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setShowTotalSelectionCount);
-
-    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(&showDragSelectionCountCheckBox, 7, 0);
-    generalGrid->addWidget(&showTotalSelectionCountCheckBox, 8, 0);
-    generalGrid->addWidget(&useTearOffMenusCheckBox, 9, 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"));
-    showDragSelectionCountCheckBox.setText(tr("Show selection counter during drag selection"));
-    showTotalSelectionCountCheckBox.setText(tr("Show total selection counter"));
-    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");
-}
\ No newline at end of file
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
deleted file mode 100644
index 6dd43ceae..000000000
--- a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef COCKATRICE_USER_INTERFACE_SETTINGS_PAGE_H
-#define COCKATRICE_USER_INTERFACE_SETTINGS_PAGE_H
-
-#include "abstract_settings_page.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QSpinBox>
-#include <libcockatrice/utility/macros.h>
-
-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 showDragSelectionCountCheckBox;
-    QCheckBox showTotalSelectionCountCheckBox;
-    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;
-};
-
-#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 a8cc4cee6..afc834e10 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@@ -56,9 +56,6 @@ AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Ta
 
     deckStateManager = new DeckStateManager(this);
 
-    databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this);
-    databaseModel->setObjectName("databaseModel");
-
     cardDatabaseDockWidget = new DeckEditorCardDatabaseDockWidget(this);
     deckDockWidget = new DeckEditorDeckDockWidget(this);
     cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this);
@@ -108,17 +105,16 @@ void AbstractTabDeckEditor::registerDockWidget(QMenu *_viewMenu, QDockWidget *wi
     dockToActions.insert(widget, {menu, aVisible, aFloating, defaultSize});
 }
 
+/**
+ * @brief Updates the card info dock and printing selector.
+ * @param card The card to display.
+ */
 void AbstractTabDeckEditor::updateCard(const ExactCard &card)
 {
     cardInfoDockWidget->updateCard(card);
     printingSelectorDockWidget->printingSelector->setCard(card.getCardPtr());
 }
 
-void AbstractTabDeckEditor::updateCardInfo(const ExactCard &card)
-{
-    cardInfoDockWidget->updateCard(card);
-}
-
 /** @brief Placeholder: called when the deck changes. */
 void AbstractTabDeckEditor::onDeckChanged()
 {
@@ -133,14 +129,48 @@ void AbstractTabDeckEditor::onDeckModified()
     emit tabTextChanged(this, getTabText());
 }
 
-void AbstractTabDeckEditor::addCard(const ExactCard &card, const QString &zoneName)
+/**
+ * @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, const QString &zoneName)
 {
     deckStateManager->addCard(card, zoneName);
+
+    cardDatabaseDockWidget->highlightAllSearchEdit();
 }
 
-void AbstractTabDeckEditor::decrementCard(const ExactCard &card, const QString &zoneName)
+/**
+ * @brief Adds a card to the main deck or sideboard depending on Ctrl key.
+ */
+void AbstractTabDeckEditor::actAddCard(const ExactCard &card)
 {
-    deckStateManager->decrementCard(card, zoneName);
+    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)
+{
+    deckStateManager->decrementCard(card, DECK_ZONE_MAIN);
+}
+
+/** @brief Decrements a card from the sideboard. */
+void AbstractTabDeckEditor::actDecrementCardFromSideboard(const ExactCard &card)
+{
+    deckStateManager->decrementCard(card, DECK_ZONE_SIDE);
 }
 
 /**
@@ -173,9 +203,8 @@ void AbstractTabDeckEditor::setDeck(const LoadedDeck &_deck)
 void AbstractTabDeckEditor::actNewDeck()
 {
     auto deckOpenLocation = confirmOpen(false);
-    if (deckOpenLocation == CANCELLED) {
+    if (deckOpenLocation == CANCELLED)
         return;
-    }
 
     if (deckOpenLocation == NEW_TAB) {
         emit openDeckEditor(LoadedDeck());
@@ -200,25 +229,22 @@ void AbstractTabDeckEditor::cleanDeckAndResetModified()
 AbstractTabDeckEditor::DeckOpenLocation AbstractTabDeckEditor::confirmOpen(const bool openInSameTabIfBlank)
 {
     if (SettingsCache::instance().getOpenDeckInNewTab()) {
-        if (openInSameTabIfBlank && deckStateManager->isBlankNewDeck()) {
+        if (openInSameTabIfBlank && deckStateManager->isBlankNewDeck())
             return SAME_TAB;
-        } else {
+        else
             return NEW_TAB;
-        }
     }
 
-    if (!deckStateManager->isModified()) {
+    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:
@@ -251,14 +277,12 @@ 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);
@@ -271,9 +295,8 @@ void AbstractTabDeckEditor::actLoadDeck()
 void AbstractTabDeckEditor::actOpenRecent(const QString &fileName)
 {
     auto deckOpenLocation = confirmOpen();
-    if (deckOpenLocation == CANCELLED) {
+    if (deckOpenLocation == CANCELLED)
         return;
-    }
 
     openDeckFromFile(fileName, deckOpenLocation);
 }
@@ -326,9 +349,8 @@ bool AbstractTabDeckEditor::actSaveDeck()
 
         return true;
     }
-    if (loadedDeck.lastLoadInfo.fileName.isEmpty()) {
+    if (loadedDeck.lastLoadInfo.fileName.isEmpty())
         return actSaveDeckAs();
-    }
 
     if (DeckLoader::saveToFile(loadedDeck)) {
         deckStateManager->setModified(false);
@@ -356,9 +378,8 @@ bool AbstractTabDeckEditor::actSaveDeckAs()
     dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS);
     dialog.selectFile(deckList.getName().trimmed());
 
-    if (!dialog.exec()) {
+    if (!dialog.exec())
         return false;
-    }
 
     QString fileName = dialog.selectedFiles().at(0);
     DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(fileName);
@@ -384,11 +405,10 @@ bool AbstractTabDeckEditor::actSaveDeckAs()
  */
 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 {
+    else
         deckStateManager->setModified(false);
-    }
 }
 
 /**
@@ -398,14 +418,12 @@ 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({.deckList = dlg.getDeckList()});
@@ -425,9 +443,8 @@ void AbstractTabDeckEditor::editDeckInClipboard(bool annotated)
 {
     LoadedDeck loadedDeck = deckStateManager->toLoadedDeck();
     DlgEditDeckInClipboard dlg(loadedDeck.deckList, annotated, this);
-    if (!dlg.exec()) {
+    if (!dlg.exec())
         return;
-    }
 
     setDeck({dlg.getDeckList(), loadedDeck.lastLoadInfo});
     deckStateManager->setModified(true);
@@ -485,14 +502,12 @@ 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({.deckList = dlg.getDeck()});
@@ -542,14 +557,14 @@ void AbstractTabDeckEditor::actExportDeckDecklistXyz()
 /** @brief Analyzes the deck using DeckStats. */
 void AbstractTabDeckEditor::actAnalyzeDeckDeckstats()
 {
-    auto *interface = new DeckStatsInterface(this);
+    auto *interface = new DeckStatsInterface(*cardDatabaseDockWidget->getDatabase(), this);
     interface->analyzeDeck(deckStateManager->getDeckList());
 }
 
 /** @brief Analyzes the deck using TappedOut. */
 void AbstractTabDeckEditor::actAnalyzeDeckTappedout()
 {
-    auto *interface = new TappedOutInterface(this);
+    auto *interface = new TappedOutInterface(*cardDatabaseDockWidget->getDatabase(), this);
     interface->analyzeDeck(deckStateManager->getDeckList());
 }
 
@@ -575,11 +590,10 @@ bool AbstractTabDeckEditor::confirmClose()
     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;
 }
@@ -587,20 +601,7 @@ 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 34c585597..477c3f973 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
@@ -77,8 +77,8 @@ class QAction;
  *
  * **Key Methods:**
  *
- * - 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.
+ * - actAddCard(const ExactCard &card) — Adds a card to the deck.
+ * - actDecrementCard(const ExactCard &card) — 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.
@@ -126,7 +126,6 @@ public:
 
     // UI Elements
     DeckStateManager *deckStateManager;
-    CardDatabaseModel *databaseModel;                                 ///< Card database
     DeckEditorMenu *deckMenu;                                         ///< Menu for deck operations
     DeckEditorCardDatabaseDockWidget *cardDatabaseDockWidget;         ///< Database dock
     DeckEditorCardInfoDockWidget *cardInfoDockWidget;                 ///< Card info dock
@@ -141,35 +140,22 @@ public slots:
     /** @brief Called when the deck is modified. */
     virtual void onDeckModified();
 
-    /**
-     * @brief Updates the card info dock and printing selector.
-     * @param card The card to display.
+    /** @brief Updates the card info panel.
+     *  @param card The card to display.
      */
     void updateCard(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 main deck or sideboard based on Ctrl key. */
+    void actAddCard(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 Adds a card to the sideboard explicitly. */
+    void actAddCardToSideboard(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 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 Opens a recently opened deck file. */
     void actOpenRecent(const QString &fileName);
@@ -180,15 +166,8 @@ public slots:
     /** @brief Requests closing the tab. */
     bool closeRequest() override;
 
-    /** @brief Shows the printing selector dock and updates it with the current card. */
-    void showPrintingSelector();
-
-    /**
-     * @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);
+    /** @brief Shows the printing selector dock. Pure virtual. */
+    virtual void showPrintingSelector() = 0;
 
 signals:
     /** @brief Emitted when a deck should be opened in a new editor tab. */
@@ -314,6 +293,9 @@ protected:
      */
     QMessageBox *createSaveConfirmationWindow();
 
+    /** @brief Helper function to add a card to a specific deck zone. */
+    void addCardHelper(const ExactCard &card, const QString &zoneName);
+
     /** @brief Opens a deck from a file. */
     virtual void openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation);
 
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
index 5b5c16302..ac1b66e14 100644
--- 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
@@ -98,79 +98,55 @@ inline static DeckFormat apiNameToFormat(const QString &name)
 {
     const QString n = name.trimmed();
 
-    if (n.compare("Standard", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Standard", Qt::CaseInsensitive) == 0)
         return DeckFormat::Standard;
-    }
-    if (n.compare("Modern", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Modern", Qt::CaseInsensitive) == 0)
         return DeckFormat::Modern;
-    }
-    if (n.compare("Commander", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Commander", Qt::CaseInsensitive) == 0)
         return DeckFormat::Commander;
-    }
-    if (n.compare("Legacy", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Legacy", Qt::CaseInsensitive) == 0)
         return DeckFormat::Legacy;
-    }
-    if (n.compare("Vintage", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Vintage", Qt::CaseInsensitive) == 0)
         return DeckFormat::Vintage;
-    }
-    if (n.compare("Pauper", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Pauper", Qt::CaseInsensitive) == 0)
         return DeckFormat::Pauper;
-    }
-    if (n.compare("Custom", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Custom", Qt::CaseInsensitive) == 0)
         return DeckFormat::Custom;
-    }
-    if (n.compare("Frontier", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Frontier", Qt::CaseInsensitive) == 0)
         return DeckFormat::Frontier;
-    }
-    if (n.compare("Future Std", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Future Std", Qt::CaseInsensitive) == 0)
         return DeckFormat::FutureStandard;
-    }
-    if (n.compare("Penny Dreadful", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Penny Dreadful", Qt::CaseInsensitive) == 0)
         return DeckFormat::PennyDreadful;
-    }
-    if (n.compare("1v1 Commander", Qt::CaseInsensitive) == 0) {
+    if (n.compare("1v1 Commander", Qt::CaseInsensitive) == 0)
         return DeckFormat::Commander1v1;
-    }
-    if (n.compare("Dual Commander", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Dual Commander", Qt::CaseInsensitive) == 0)
         return DeckFormat::DualCommander;
-    }
-    if (n.compare("Brawl", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Brawl", Qt::CaseInsensitive) == 0)
         return DeckFormat::Brawl;
-    }
 
-    if (n.compare("Alchemy", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Alchemy", Qt::CaseInsensitive) == 0)
         return DeckFormat::Alchemy;
-    }
-    if (n.compare("Historic", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Historic", Qt::CaseInsensitive) == 0)
         return DeckFormat::Historic;
-    }
-    if (n.compare("Gladiator", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Gladiator", Qt::CaseInsensitive) == 0)
         return DeckFormat::Gladiator;
-    }
-    if (n.compare("Oathbreaker", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Oathbreaker", Qt::CaseInsensitive) == 0)
         return DeckFormat::Oathbreaker;
-    }
-    if (n.compare("Old School", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Old School", Qt::CaseInsensitive) == 0)
         return DeckFormat::OldSchool;
-    }
-    if (n.compare("Pauper Commander", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Pauper Commander", Qt::CaseInsensitive) == 0)
         return DeckFormat::PauperCommander;
-    }
-    if (n.compare("Pioneer", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Pioneer", Qt::CaseInsensitive) == 0)
         return DeckFormat::Pioneer;
-    }
-    if (n.compare("PreDH", Qt::CaseInsensitive) == 0) {
+    if (n.compare("PreDH", Qt::CaseInsensitive) == 0)
         return DeckFormat::PreDH;
-    }
-    if (n.compare("Premodern", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Premodern", Qt::CaseInsensitive) == 0)
         return DeckFormat::Premodern;
-    }
-    if (n.compare("Standard Brawl", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Standard Brawl", Qt::CaseInsensitive) == 0)
         return DeckFormat::StandardBrawl;
-    }
-    if (n.compare("Timeless", Qt::CaseInsensitive) == 0) {
+    if (n.compare("Timeless", Qt::CaseInsensitive) == 0)
         return DeckFormat::Timeless;
-    }
 
     return DeckFormat::Unknown;
 }
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 46c229156..5b879f8ae 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
@@ -21,16 +21,16 @@ void ArchidektApiResponseCard::fromJson(const QJsonObject &json)
     edition.fromJson(json.value("edition").toObject());
 
     flavor = json.value("flavor").toString();
-    //! \todo Parse games and options fields (not really important).
-    // games = {""};
-    // options = {""};
+    //! \todo but not really important
+    //! \todo games = {""};
+    //! \todo options = {""};
     scryfallImageHash = json.value("scryfallImageHash").toString();
     oracleCard = json.value("oracleCard").toObject();
     owned = json.value("owned").toInt();
     pinnedStatus = json.value("pinnedStatus").toInt();
     rarity = json.value("rarity").toString();
-    //! \todo Parse globalCategories field (not really important).
-    // globalCategories = {""};
+    //! \todo but not really important
+    //! \todo globalCategories = {""};
 }
 
 void ArchidektApiResponseCard::debugPrint() const
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 559580da2..265498228 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
@@ -24,7 +24,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 f51d0f3e7..7a424de8b 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
@@ -4,29 +4,10 @@ void ArchidektApiResponseCardEntry::fromJson(const QJsonObject &json)
 {
     id = json.value("id").toInt();
 
-    categories.clear();
-
     auto categoriesJson = json.value("categories").toArray();
 
-    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);
+    for (auto category : categoriesJson) {
+        categories.append(category.toString());
     }
 
     companion = json.value("companion").toBool();
@@ -46,13 +27,7 @@ void ArchidektApiResponseCardEntry::fromJson(const QJsonObject &json)
 void ArchidektApiResponseCardEntry::debugPrint() const
 {
     qDebug() << "Id:" << id;
-    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() << "Categories:" << categories;
     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 118cf5b13..f7f86e9ed 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
@@ -9,15 +9,6 @@
 #include <QString>
 #include <QVector>
 
-struct Category
-{
-    int id;
-    QString name;
-    bool isPremier;
-    bool includedInDeck;
-    bool includedInPrice;
-};
-
 class ArchidektApiResponseCardEntry
 {
 public:
@@ -33,9 +24,9 @@ public:
     ArchidektApiResponseCard getCard() const
     {
         return card;
-    }
+    };
 
-    QList<Category> getCategories() const
+    QStringList getCategories() const
     {
         return categories;
     }
@@ -47,7 +38,7 @@ public:
 
 private:
     int id;
-    QList<Category> categories;
+    QStringList categories;
     bool companion;
     bool flippedDefault;
     QString label;
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 a27d8d961..98d8c6c8c 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
@@ -44,7 +44,7 @@ void ArchidektApiResponseDeck::fromJson(const QJsonObject &json)
         cards.append(entry);
     }
 
-    //! \todo Parse customCards field (not really important).
+    // TODO but 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 b539d9dd1..fce437751 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
@@ -27,7 +27,7 @@ public:
     QVector<ArchidektApiResponseCardEntry> getCards() const
     {
         return cards;
-    }
+    };
 
     QVector<ArchidektApiResponseDeckCategory> getCategories() const
     {
@@ -37,7 +37,7 @@ public:
     QString getDeckName() const
     {
         return name;
-    }
+    };
 
     int getDeckFormat() const
     {
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 416621b41..16ea60487 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
@@ -23,7 +23,7 @@ void ArchidektApiResponseDeckListingContainer::fromJson(const QJsonObject &json)
     theoryCrafted = json.value("theoryCrafted").toBool();
     game = json.value("game").toString();
     hasDescription = json.value("hasDescription").toBool();
-    //! \todo Parse tags field.
+    // TODO
     // 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_owner.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
index 3d6eac03d..2ba926f8b 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
@@ -7,7 +7,7 @@ void ArchidektApiResponseDeckOwner::fromJson(const QJsonObject &json)
     avatar = QUrl(json.value("avatar").toString());
     moderator = json.value("moderator").toBool();
     pledgeLevel = json.value("pledgeLevel").toInt();
-    //! \todo Parse roles field (not really important).
+    // TODO but not really important
     // roles = {""};
 }
 
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 66b68d823..8b17cd49e 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
@@ -63,60 +63,16 @@ ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWi
     QString tempDeck;
     QTextStream deckStream(&tempDeck);
 
-    QString mainboardText;
-    QString sideboardText;
-
-    QTextStream mainStream(&mainboardText);
-    QTextStream sideStream(&sideboardText);
-
-    for (const auto &card : response.getCards()) {
+    for (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();
 
-        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;
+        tempDeck += QString("%1 %2 (%3) %4\n")
+                        .arg(card.getQuantity())
+                        .arg(cleanName)
+                        .arg(card.getCard().getEdition().getEditionCode().toUpper())
+                        .arg(card.getCard().getCollectorNumber());
     }
 
     model = new DeckListModel(this);
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 70156df79..c26220869 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
@@ -20,27 +20,21 @@ 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));
 }
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 f9a887aa4..479de5fc8 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
@@ -82,16 +82,16 @@ public:
     void resizeEvent(QResizeEvent *event) override;
 
 private:
-    /** @brief Slider controlling the scale of card thumbnails in all deck entry widgets. */
+    /// Slider controlling the scale of card thumbnails in all deck entry widgets.
     CardSizeWidget *cardSizeSlider;
 
-    /** @brief Main horizontal layout containing the FlowWidget. */
+    /// Main horizontal layout containing the FlowWidget.
     QHBoxLayout *layout;
 
-    /** @brief Container providing scrollable multi-row flow layout of deck entries. */
+    /// Container providing scrollable multi-row flow layout of deck entries.
     FlowWidget *flowWidget;
 
-    /** @brief Shared network manager used to download card images for all child entry widgets. */
+    /// 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/tab_archidekt.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
index 9cac74d50..352d55c79 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
@@ -93,11 +93,10 @@ void TabArchidekt::initializeUi()
         colorLayout->addWidget(manaSymbol);
 
         connect(manaSymbol, &ManaSymbolWidget::colorToggled, this, [this](QChar c, bool active) {
-            if (active) {
+            if (active)
                 activeColors.insert(c);
-            } else {
+            else
                 activeColors.remove(c);
-            }
             doSearch();
         });
     }
@@ -299,18 +298,16 @@ void TabArchidekt::setupFilterWidgets()
         searchModel->updateSearchResults(text);
         QString pattern = ".*" + QRegularExpression::escape(text) + ".*";
         proxyModel->setFilterRegularExpression(QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption));
-        if (!text.isEmpty()) {
+        if (!text.isEmpty())
             completer->complete();
-        }
     });
 
     connect(commandersField, &QLineEdit::textChanged, this, [=](const QString &text) {
         searchModel->updateSearchResults(text);
         QString pattern = ".*" + QRegularExpression::escape(text) + ".*";
         proxyModel->setFilterRegularExpression(QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption));
-        if (!text.isEmpty()) {
+        if (!text.isEmpty())
             completer->complete();
-        }
     });
 
     // Assemble secondary toolbar
@@ -495,13 +492,12 @@ QString TabArchidekt::buildSearchUrl()
 
         QString logic = "GTE";
         QString selected = minDeckSizeLogicCombo->currentText();
-        if (selected == "≥") {
+        if (selected == "≥")
             logic = "GTE";
-        } else if (selected == "≤") {
+        else if (selected == "≤")
             logic = "LTE";
-        } else {
+        else
             logic = "";
-        }
 
         if (!logic.isEmpty()) {
             query.addQueryItem("sizeLogic", logic);
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 7bc97c431..cd4f9d99c 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,8 +1,8 @@
 /**
  * @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
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 bd874d067..66a407acd 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.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
index d76dda490..07b53dd97 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
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 931850ea9..86d78c5e3 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.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
index 2df29de0c..15691fbe4 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,8 +1,8 @@
 /**
  * @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
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 293e9a150..629eb8273 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
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 695498e2b..fb89c0b12 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,8 +1,8 @@
 /**
  * @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
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 10aa51ff4..26c5afedb 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,8 +1,8 @@
 /**
  * @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
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 0337d94f8..48219893a 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,8 +1,8 @@
 /**
  * @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
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 8943ae9f3..80d32a394 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,8 +1,8 @@
 /**
  * @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
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 9d45f254b..c01c7fa43 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
@@ -3,7 +3,6 @@
 #include "../../../../../general/display/background_plate_widget.h"
 #include "../../tab_edhrec_main.h"
 
-#include <QMouseEvent>
 #include <libcockatrice/card/database/card_database_manager.h>
 
 EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget(
@@ -49,7 +48,7 @@ EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWi
     if (parentTab) {
         cardPictureWidget->setScaleFactor(parentTab->getCardSizeSlider()->getSlider()->value());
         connect(cardPictureWidget, &CardInfoPictureWidget::cardClicked, this,
-                &EdhrecApiResponseCardDetailsDisplayWidget::mousePressEvent);
+                &EdhrecApiResponseCardDetailsDisplayWidget::actRequestPageNavigation);
         connect(parentTab->getCardSizeSlider()->getSlider(), &QSlider::valueChanged, cardPictureWidget,
                 &CardInfoPictureWidget::setScaleFactor);
         connect(this, &EdhrecApiResponseCardDetailsDisplayWidget::requestUrl, parentTab,
@@ -60,9 +59,7 @@ EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWi
 void EdhrecApiResponseCardDetailsDisplayWidget::mousePressEvent(QMouseEvent *event)
 {
     QWidget::mousePressEvent(event);
-    if (event->button() == Qt::LeftButton) {
-        actRequestPageNavigation();
-    }
+    actRequestPageNavigation();
 }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
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 5daf32412..82dcfb8b0 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,8 +1,8 @@
 /**
  * @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
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 516d820eb..43baddb4c 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,8 +1,8 @@
 /**
  * @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
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 555da6ecf..d34c3da34 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,8 +1,8 @@
 /**
  * @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
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 5800b5497..c2e1c018c 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,8 +1,8 @@
 /**
  * @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
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 4201ce3b3..8e74588e2 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,8 +1,8 @@
 /**
  * @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
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 80da8a7f8..1678e1380 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,8 +1,8 @@
 /**
  * @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
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 9b46b54ba..10dfa8223 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,8 +1,8 @@
 /**
  * @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
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 30998391c..e2748bf10 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,8 +1,8 @@
 /**
  * @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
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 2b9563ea5..766518c02 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,8 +1,8 @@
 /**
  * @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
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 4a4fc8991..64228b85d 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,8 +1,8 @@
 /**
  * @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
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 5ce36c9cf..b5ee8d2ca 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
@@ -1,8 +1,8 @@
 /**
  * @file tab_edhrec.h
  * @ingroup Tabs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TAB_EDHREC_H
 #define TAB_EDHREC_H
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 a7ed83efd..04cf03fc1 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,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/interface/widgets/tabs/tab.h b/cockatrice/src/interface/widgets/tabs/tab.h
index 6ea1f5077..7cff01130 100644
--- a/cockatrice/src/interface/widgets/tabs/tab.h
+++ b/cockatrice/src/interface/widgets/tabs/tab.h
@@ -1,8 +1,8 @@
 /**
  * @file tab.h
  * @ingroup Tabs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TAB_H
 #define TAB_H
diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.h b/cockatrice/src/interface/widgets/tabs/tab_account.h
index 887038ebb..e09c12eb2 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_account.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_account.h
@@ -1,8 +1,8 @@
 /**
  * @file tab_account.h
  * @ingroup AccountTabs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TAB_ACCOUNT_H
 #define TAB_ACCOUNT_H
diff --git a/cockatrice/src/interface/widgets/tabs/tab_admin.h b/cockatrice/src/interface/widgets/tabs/tab_admin.h
index 0da098ba5..e1935e351 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
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
index 4e7cbfecf..59ee6bdeb 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
@@ -81,9 +81,8 @@ void TabDeckEditor::createMenus()
 QString TabDeckEditor::getTabText() const
 {
     QString result = tr("Deck: %1").arg(deckStateManager->getSimpleDeckName());
-    if (deckStateManager->isModified()) {
+    if (deckStateManager->isModified())
         result.prepend("* ");
-    }
     return result;
 }
 
@@ -120,6 +119,16 @@ 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());
+    printingSelectorDockWidget->printingSelector->updateDisplay();
+    printingSelectorDockWidget->setVisible(true);
+}
+
 /**
  * @brief Loads deck editor layout from settings or resets to default.
  */
@@ -128,9 +137,9 @@ void TabDeckEditor::loadLayout()
     LayoutsSettings &layouts = SettingsCache::instance().layouts();
 
     auto layoutState = layouts.getDeckEditorLayoutState();
-    if (layoutState.isNull()) {
+    if (layoutState.isNull())
         restartLayout();
-    } else {
+    else {
         restoreState(layoutState);
         restoreGeometry(layouts.getDeckEditorGeometry());
     }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
index 14be59cd7..ab7a0bfc5 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
@@ -83,6 +83,10 @@ 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 bdf7901f1..26e3f2ecf 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
@@ -181,9 +181,8 @@ void TabDeckStorage::retranslateUi()
 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());
@@ -238,15 +237,13 @@ 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);
 
         std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(filePath, DeckFileFormat::Cockatrice, true);
-        if (!deckOpt) {
+        if (!deckOpt)
             continue;
-        }
 
         emit openDeckEditor(deckOpt.value());
     }
@@ -323,12 +320,10 @@ void TabDeckStorage::uploadDeck(const QString &filePath, const QString &targetPa
         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.setName(deckName);
     } else {
         deck.setName(deck.getName().left(MAX_NAME_LENGTH));
@@ -377,9 +372,8 @@ 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);
 }
@@ -393,9 +387,8 @@ 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()) {
@@ -421,9 +414,8 @@ 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());
@@ -436,17 +428,15 @@ 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);
 
     std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromRemote(QString::fromStdString(resp.deck()), cmd.deck_id());
-    if (!deckOpt) {
+    if (!deckOpt)
         return;
-    }
 
     emit openDeckEditor(deckOpt.value());
 }
@@ -498,9 +488,8 @@ 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();
@@ -515,14 +504,12 @@ 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.
@@ -540,9 +527,8 @@ 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()),
@@ -576,9 +562,8 @@ 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;
@@ -600,26 +585,22 @@ 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);
-    }
 }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
index a863e0625..f8c0497f7 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
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
index a81161e83..cf8269069 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
@@ -1,21 +1,18 @@
 #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 "../game/game.h"
-#include "../game/player/player_logic.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/replay.h"
-#include "../game_graphics/board/arrow_item.h"
-#include "../game_graphics/board/card_item.h"
-#include "../game_graphics/deckview/deck_view_container.h"
-#include "../game_graphics/deckview/tabbed_deck_view_container.h"
-#include "../game_graphics/game_scene.h"
-#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"
@@ -50,7 +47,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
     : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr)
 {
     // THIS CTOR IS USED ON REPLAY
-    game = new Replay(this, _replay, tabSupervisor->getIsLocalGame());
+    game = new Replay(this, _replay);
 
     createCardInfoDock(true);
     createPlayerListDock(true);
@@ -94,7 +91,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor,
     : Tab(_tabSupervisor), userListProxy(_tabSupervisor->getUserListManager())
 {
     // THIS CTOR IS USED ON GAMES
-    game = new Game(this, tabSupervisor->getIsLocalGame(), _clients, event, _roomGameTypes);
+    game = new Game(this, _clients, event, _roomGameTypes);
 
     createCardInfoDock();
     createPlayerListDock();
@@ -128,9 +125,8 @@ 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);
 }
@@ -263,9 +259,6 @@ TabGame::~TabGame()
     if (replayManager) {
         delete replayManager->replay;
     }
-    for (auto &player : game->getPlayerManager()->getPlayers()) {
-        player->clear();
-    }
 }
 
 void TabGame::updatePlayerListDockTitle()
@@ -286,14 +279,12 @@ void TabGame::retranslateUi()
     updatePlayerListDockTitle();
     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"));
     }
 
@@ -319,9 +310,8 @@ void TabGame::retranslateUi()
     if (aRotateViewCCW) {
         aRotateViewCCW->setText(tr("Rotate View Co&unterclockwise"));
     }
-    if (aGameInfo) {
+    if (aGameInfo)
         aGameInfo->setText(tr("Game &information"));
-    }
     if (aConcede) {
         if (game->getPlayerManager()->isMainPlayerConceded()) {
             aConcede->setText(tr("Un&concede"));
@@ -366,14 +356,13 @@ void TabGame::retranslateUi()
 
     cardInfoFrameWidget->retranslateUi();
 
-    for (auto playerView : scene->getPlayers().values()) {
-        playerView->retranslateUi();
-    }
+    QMapIterator<int, Player *> i(game->getPlayerManager()->getPlayers());
 
+    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();
 }
@@ -491,22 +480,19 @@ void TabGame::actGameInfo()
 
 void TabGame::actConcede()
 {
-    PlayerLogic *player = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
-    if (player == nullptr) {
+    Player *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();
     } 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();
     }
 }
@@ -522,23 +508,20 @@ 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 (!replayDock) {
+        if (!replayDock)
             emit gameLeft();
-        }
     }
     return true;
 }
 
 void TabGame::actSay()
 {
-    if (completer->popup()->isVisible()) {
+    if (completer->popup()->isVisible())
         return;
-    }
 
     if (sayEdit->text().startsWith("/card ")) {
         cardInfoFrameWidget->setCard(sayEdit->text().mid(6));
@@ -583,9 +566,8 @@ void TabGame::actPhaseAction()
 void TabGame::actNextPhase()
 {
     int phase = game->getGameState()->getCurrentPhase();
-    if (++phase >= phasesToolbar->phaseCount()) {
+    if (++phase >= phasesToolbar->phaseCount())
         phase = 0;
-    }
 
     emit phaseChanged(phase);
 }
@@ -608,9 +590,16 @@ void TabGame::actNextPhaseAction()
 
 void TabGame::actRemoveLocalArrows()
 {
-    auto *local = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
-    if (local) {
-        scene->clearArrowsForPlayer(local->getPlayerInfo()->getId());
+    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());
+        }
     }
 }
 
@@ -649,19 +638,15 @@ void TabGame::notifyPlayerKicked()
     msgBox.exec();
 }
 
-PlayerLogic *TabGame::addPlayer(PlayerLogic *newPlayer)
+Player *TabGame::addPlayer(Player *newPlayer)
 {
     QString newPlayerName = "@" + newPlayer->getPlayerInfo()->getName();
     addPlayerToAutoCompleteList(newPlayerName);
 
     scene->addPlayer(newPlayer);
 
-    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);
+    connect(newPlayer, &Player::newCardAdded, this, &TabGame::newCardAdded);
+    connect(newPlayer->getPlayerMenu(), &PlayerMenu::cardMenuUpdated, this, &TabGame::setCardMenu);
 
     messageLog->connectToPlayerEventHandler(newPlayer->getPlayerEventHandler());
 
@@ -674,17 +659,17 @@ PlayerLogic *TabGame::addPlayer(PlayerLogic *newPlayer)
         addLocalPlayer(newPlayer, newPlayer->getPlayerInfo()->getId());
     }
 
-    gameMenu->insertMenu(playersSeparator, view->getPlayerMenu()->getPlayerMenu());
+    gameMenu->insertMenu(playersSeparator, newPlayer->getPlayerMenu()->getPlayerMenu());
 
     createZoneForPlayer(newPlayer, newPlayer->getPlayerInfo()->getId());
 
     return newPlayer;
 }
 
-void TabGame::addLocalPlayer(PlayerLogic *newPlayer, int playerId)
+void TabGame::addLocalPlayer(Player *newPlayer, int playerId)
 {
     if (game->getGameState()->getClients().size() == 1) {
-        scene->viewForPlayer(playerId)->getPlayerMenu()->setShortcutsActive();
+        newPlayer->getPlayerMenu()->setShortcutsActive();
     }
 
     auto *deckView = new TabbedDeckViewContainer(playerId, this);
@@ -702,26 +687,29 @@ void TabGame::addLocalPlayer(PlayerLogic *newPlayer, int playerId)
     }
 }
 
-void TabGame::processPlayerLeave(PlayerLogic *leavingPlayer)
+void TabGame::processPlayerLeave(Player *leavingPlayer)
 {
-    removePlayerFromAutoCompleteList("@" + leavingPlayer->getPlayerInfo()->getName());
+    QString playerName = "@" + leavingPlayer->getPlayerInfo()->getName();
+    removePlayerFromAutoCompleteList(playerName);
+
+    scene->removePlayer(leavingPlayer);
 
     // 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.
-    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;
+    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;
+                }
             }
         }
     }
-
-    scene->removePlayer(leavingPlayer);
 }
 
 void TabGame::processRemotePlayerDeckSelect(QString deckList, int playerId, QString playerName)
@@ -746,13 +734,13 @@ void TabGame::processMultipleRemotePlayerDeckSelect(QVector<QPair<int, QPair<QSt
     }
 }
 
-void TabGame::processLocalPlayerDeckSelect(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo)
+void TabGame::processLocalPlayerDeckSelect(Player *localPlayer, int playerId, ServerInfo_Player playerInfo)
 {
     loadDeckForLocalPlayer(localPlayer, playerId, playerInfo);
     processLocalPlayerReady(playerId, playerInfo);
 }
 
-void TabGame::loadDeckForLocalPlayer(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo)
+void TabGame::loadDeckForLocalPlayer(Player *localPlayer, int playerId, ServerInfo_Player playerInfo)
 {
     TabbedDeckViewContainer *deckViewContainer = deckViewContainers.value(playerId);
     if (playerInfo.has_deck_list()) {
@@ -779,7 +767,7 @@ void TabGame::processLocalPlayerReadyStateChanged(int playerId, bool ready)
     deckViewContainers.value(playerId)->playerDeckView->setReadyStart(ready);
 }
 
-void TabGame::createZoneForPlayer(PlayerLogic *newPlayer, int playerId)
+void TabGame::createZoneForPlayer(Player *newPlayer, int playerId)
 {
     if (!game->getPlayerManager()->getSpectators().contains(playerId)) {
 
@@ -815,10 +803,9 @@ void TabGame::startGame(bool _resuming)
     mainWidget->setCurrentWidget(gamePlayAreaWidget);
 
     if (!_resuming) {
-        QMapIterator<int, PlayerLogic *> playerIterator(game->getPlayerManager()->getPlayers());
-        while (playerIterator.hasNext()) {
+        QMapIterator<int, Player *> playerIterator(game->getPlayerManager()->getPlayers());
+        while (playerIterator.hasNext())
             playerIterator.next().value()->setGameStarted();
-        }
     }
 
     playerListWidget->setGameStarted(true, game->getGameState()->isResuming());
@@ -858,26 +845,25 @@ void TabGame::closeGame()
     gameMenu->addAction(aLeaveGame);
 }
 
-PlayerLogic *TabGame::setActivePlayer(int id)
+Player *TabGame::setActivePlayer(int id)
 {
-    PlayerLogic *player = game->getPlayerManager()->getPlayer(id);
-    if (!player) {
+    Player *player = game->getPlayerManager()->getPlayer(id);
+    if (!player)
         return nullptr;
-    }
 
     playerListWidget->setActivePlayer(id);
-    QMapIterator<int, PlayerLogic *> i(game->getPlayerManager()->getPlayers());
+    QMapIterator<int, Player *> i(game->getPlayerManager()->getPlayers());
     while (i.hasNext()) {
         i.next();
         if (i.value() == player) {
             i.value()->setActive(true);
             if (game->getGameState()->getClients().size() > 1) {
-                scene->viewForPlayer(i.value()->getPlayerInfo()->getId())->getPlayerMenu()->setShortcutsActive();
+                i.value()->getPlayerMenu()->setShortcutsActive();
             }
         } else {
             i.value()->setActive(false);
             if (game->getGameState()->getClients().size() > 1) {
-                scene->viewForPlayer(i.value()->getPlayerInfo()->getId())->getPlayerMenu()->setShortcutsInactive();
+                i.value()->getPlayerMenu()->setShortcutsInactive();
             }
         }
     }
@@ -893,13 +879,8 @@ 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);
@@ -910,31 +891,26 @@ 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 (replayDock) {
+    if (replayDock)
         tabText.append(tr("Replay") + " ");
-    }
-    if (!gameTypeInfo.isEmpty()) {
+    if (!gameTypeInfo.isEmpty())
         tabText.append(gameTypeInfo + " ");
-    }
     if (!gameDesc.isEmpty()) {
-        if (gameDesc.length() >= 15) {
+        if (gameDesc.length() >= 15)
             tabText.append("| " + gameDesc.left(15) + "... ");
-        } else {
+        else
             tabText.append("| " + gameDesc + " ");
-        }
     }
-    if (!tabText.isEmpty()) {
+    if (!tabText.isEmpty())
         tabText.append("| ");
-    }
     tabText.append("#" + gameId);
 
     return tabText;
@@ -943,7 +919,7 @@ QString TabGame::getTabText() const
 /**
  * @param menu The menu to set. Pass in nullptr to set the menu to empty.
  */
-void TabGame::setCardMenu(CardMenu *menu)
+void TabGame::setCardMenu(QMenu *menu)
 {
     if (!aCardMenu) {
         return;
@@ -970,6 +946,8 @@ 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);
@@ -1146,16 +1124,12 @@ void TabGame::actResetLayout()
 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;
@@ -1177,11 +1151,6 @@ void TabGame::createReplayDock(GameReplay *replay)
                             QDockWidget::DockWidgetMovable);
     replayDock->setWidget(replayManager);
     replayDock->setFloating(false);
-
-    connect(replayManager, &ReplayManager::eventReplayed, game->getGameEventHandler(),
-            [this](const auto &event, auto options) {
-                game->getGameEventHandler()->processGameEventContainer(event, nullptr, options);
-            });
 }
 
 void TabGame::createDeckViewContainerWidget(bool bReplay)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.h b/cockatrice/src/interface/widgets/tabs/tab_game.h
index b9289432d..d8746ccc9 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.h
@@ -3,15 +3,15 @@
  * @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/player/player_logic.h"
-#include "../game_graphics/log/message_log_widget.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"
@@ -20,7 +20,6 @@
 #include <QLoggingCategory>
 #include <QMap>
 
-class CardMenu;
 class ServerInfo_PlayerProperties;
 class TabbedDeckViewContainer;
 inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game");
@@ -100,21 +99,21 @@ private:
 
     QMap<QDockWidget *, DockActions> dockToActions;
 
-    PlayerLogic *addPlayer(PlayerLogic *newPlayer);
-    void addLocalPlayer(PlayerLogic *newPlayer, int playerId);
+    Player *addPlayer(Player *newPlayer);
+    void addLocalPlayer(Player *newPlayer, int playerId);
     void processRemotePlayerDeckSelect(QString deckList, int playerId, QString playerName);
     void processMultipleRemotePlayerDeckSelect(QVector<QPair<int, QPair<QString, QString>>> playerIdDeckMap);
-    void processLocalPlayerDeckSelect(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo);
-    void loadDeckForLocalPlayer(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo);
+    void processLocalPlayerDeckSelect(Player *localPlayer, int playerId, ServerInfo_Player playerInfo);
+    void loadDeckForLocalPlayer(Player *localPlayer, int playerId, ServerInfo_Player playerInfo);
     void processLocalPlayerReady(int playerId, ServerInfo_Player playerInfo);
-    void createZoneForPlayer(PlayerLogic *newPlayer, int playerId);
+    void createZoneForPlayer(Player *newPlayer, int playerId);
 
     void startGame(bool resuming);
     void stopGame();
     void closeGame();
     bool leaveGame();
 
-    PlayerLogic *setActivePlayer(int id);
+    Player *setActivePlayer(int id);
     void setActivePhase(int phase);
     void createMenuItems();
     void createReplayMenuItems();
@@ -138,11 +137,12 @@ signals:
     void gameLeft();
     void chatMessageSent(QString chatMessage);
     void turnAdvanced();
+    void arrowDeletionRequested(int arrowId);
 
 private slots:
     void adminLockChanged(bool lock);
     void newCardAdded(AbstractCardItem *card);
-    void setCardMenu(CardMenu *menu);
+    void setCardMenu(QMenu *menu);
 
     void actGameInfo();
     void actConcede();
@@ -163,7 +163,7 @@ private slots:
     void actCompleterChanged();
     void notifyPlayerJoin(QString playerName);
     void notifyPlayerKicked();
-    void processPlayerLeave(PlayerLogic *leavingPlayer);
+    void processPlayerLeave(Player *leavingPlayer);
     void actResetLayout();
 
     void hideEvent(QHideEvent *event) override;
diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.h b/cockatrice/src/interface/widgets/tabs/tab_home.h
index 3aae19c2b..c40dfc269 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_home.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_home.h
@@ -1,8 +1,8 @@
 /**
  * @file tab_home.h
  * @ingroup Tabs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TAB_HOME_H
 #define TAB_HOME_H
diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
index 9a030e7d9..e4f699160 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
@@ -83,22 +83,18 @@ void TabLog::getClicked()
         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());
diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.h b/cockatrice/src/interface/widgets/tabs/tab_logs.h
index 5d164dc92..a73af651b 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_logs.h
@@ -1,8 +1,8 @@
 /**
  * @file tab_logs.h
  * @ingroup ServerTabs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TAB_LOG_H
 #define TAB_LOG_H
diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.cpp b/cockatrice/src/interface/widgets/tabs/tab_message.cpp
index d77cb0391..bd0457990 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_message.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_message.cpp
@@ -72,9 +72,8 @@ void TabMessage::retranslateUi()
 
 void TabMessage::tabActivated()
 {
-    if (!sayEdit->hasFocus()) {
+    if (!sayEdit->hasFocus())
         sayEdit->setFocus();
-    }
 }
 
 QString TabMessage::getUserName() const
@@ -95,9 +94,8 @@ void TabMessage::closeEvent(QCloseEvent *event)
 
 void TabMessage::sendMessage()
 {
-    if (sayEdit->text().isEmpty() || !userOnline) {
+    if (sayEdit->text().isEmpty() || !userOnline)
         return;
-    }
 
     Command_Message cmd;
     cmd.set_user_name(otherUserInfo->name());
@@ -112,10 +110,9 @@ void TabMessage::sendMessage()
 
 void TabMessage::messageSent(const Response &response)
 {
-    if (response.response_code() == Response::RespInIgnoreList) {
+    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."));
-    }
 }
 
 void TabMessage::processUserMessageEvent(const Event_UserMessage &event)
@@ -123,15 +120,12 @@ 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().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();
 }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.h b/cockatrice/src/interface/widgets/tabs/tab_message.h
index 0472bb061..36a0b5f78 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
diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
index af52c038f..2db9e83c5 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
@@ -30,8 +30,6 @@
 #include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 
-inline Q_LOGGING_CATEGORY(TabReplaysLog, "replays_tab");
-
 TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo)
     : Tab(_tabSupervisor), client(_client)
 {
@@ -256,24 +254,20 @@ 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 (!f.open(QIODevice::ReadOnly))
             continue;
-        }
         QByteArray _data = f.readAll();
         f.close();
 
         GameReplay *replay = new GameReplay;
-        if (replay->ParseFromArray(_data.data(), _data.size())) {
-            emit openReplay(replay);
-        } else {
-            qCWarning(TabReplaysLog) << "could not parse replay!";
-        }
+        replay->ParseFromArray(_data.data(), _data.size());
+
+        emit openReplay(replay);
     }
 }
 
@@ -321,9 +315,8 @@ 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);
 }
@@ -381,18 +374,14 @@ 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;
-    if (replay->ParseFromString(resp.replay_data())) {
+    replay->ParseFromString(resp.replay_data());
 
-        emit openReplay(replay);
-    } else {
-        qCWarning(TabReplaysLog) << "could not parse remote replay!";
-    }
+    emit openReplay(replay);
 }
 
 void TabReplays::actDownload()
@@ -442,9 +431,8 @@ 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();
@@ -480,9 +468,8 @@ 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);
@@ -519,9 +506,8 @@ 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 aa4ec039c..fa1131cd5 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_replays.h
@@ -2,8 +2,8 @@
  * @file tab_replays.h
  * @ingroup Replays
  * @ingroup Tabs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TAB_REPLAYS_H
 #define TAB_REPLAYS_H
diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
index 424742e9b..92e38662b 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
@@ -41,10 +41,9 @@ 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);
@@ -118,9 +117,8 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
     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);
@@ -184,9 +182,8 @@ void TabRoom::closeEvent(QCloseEvent *event)
 
 void TabRoom::tabActivated()
 {
-    if (!sayEdit->hasFocus()) {
+    if (!sayEdit->hasFocus())
         sayEdit->setFocus();
-    }
 }
 
 QString TabRoom::sanitizeHtml(QString dirty) const
@@ -214,9 +211,8 @@ 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()
@@ -262,9 +258,8 @@ 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));
-    }
 }
 
 void TabRoom::processJoinRoomEvent(const Event_JoinRoom &event)
@@ -289,30 +284,26 @@ 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)) {
+            !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().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 eeb5a9e14..67d9afc86 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_room.h
@@ -2,8 +2,8 @@
  * @file tab_room.h
  * @ingroup RoomTabs
  * @ingroup Lobby
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TAB_ROOM_H
 #define TAB_ROOM_H
diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.cpp b/cockatrice/src/interface/widgets/tabs/tab_server.cpp
index 2fce5c1fa..aa52b4b1a 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_server.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_server.cpp
@@ -69,35 +69,27 @@ 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);
@@ -105,11 +97,9 @@ 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);
-            }
-        }
     }
 }
 
@@ -123,12 +113,10 @@ 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;
 }
@@ -136,9 +124,8 @@ 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();
 
@@ -198,9 +185,8 @@ void TabServer::joinRoom(int id, bool setCurrent)
         return;
     }
 
-    if (setCurrent) {
+    if (setCurrent)
         tabSupervisor->setCurrentWidget((QWidget *)room);
-    }
 }
 
 void TabServer::joinRoomFinished(const Response &r,
diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.h b/cockatrice/src/interface/widgets/tabs/tab_server.h
index 137823592..f2dd8f0a2 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
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
index e7075f78f..b10d615ff 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
@@ -86,22 +86,18 @@ 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);
@@ -232,25 +228,20 @@ void TabSupervisor::retranslateUi()
     tabs.append(tabAccount);
     tabs.append(tabLog);
     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());
-    }
     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) {
@@ -457,10 +448,9 @@ void TabSupervisor::startLocal(const QList<AbstractClient *> &_clients)
     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);
 }
 
@@ -469,9 +459,8 @@ void TabSupervisor::startLocal(const QList<AbstractClient *> &_clients)
  */
 void TabSupervisor::stop()
 {
-    if ((!client) && localClients.isEmpty()) {
+    if ((!client) && localClients.isEmpty())
         return;
-    }
 
     resetTabsMenu();
 
@@ -705,12 +694,10 @@ void TabSupervisor::openTabLog()
 
 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)));
 }
@@ -719,14 +706,12 @@ 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);
@@ -755,16 +740,14 @@ 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)
@@ -775,16 +758,14 @@ void TabSupervisor::addRoomTab(const ServerInfo_Room &info, bool setCurrent)
     connect(tab, &TabRoom::openMessageDialog, this, &TabSupervisor::addMessageTab);
     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));
@@ -812,18 +793,16 @@ void TabSupervisor::openReplay(GameReplay *replay)
 
 void TabSupervisor::replayLeft(TabGame *tab)
 {
-    if (tab == currentWidget()) {
+    if (tab == currentWidget())
         emit setMenu();
-    }
 
     replayTabs.removeOne(tab);
 }
 
 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;
     if (auto user = userListManager->getOnlineUser(receiverName)) {
@@ -835,9 +814,8 @@ 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;
     }
 
@@ -846,9 +824,8 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus
     connect(tab, &TabMessage::maximizeClient, this, &TabSupervisor::maximizeMainWindow);
     myAddTab(tab);
     messageTabs.insert(receiverName, tab);
-    if (focus) {
+    if (focus)
         setCurrentWidget(tab);
-    }
     return tab;
 }
 
@@ -859,9 +836,8 @@ void TabSupervisor::maximizeMainWindow()
 
 void TabSupervisor::talkLeft(TabMessage *tab)
 {
-    if (tab == currentWidget()) {
+    if (tab == currentWidget())
         emit setMenu();
-    }
 
     messageTabs.remove(tab->getUserName());
     removeTab(indexOf(tab));
@@ -958,9 +934,8 @@ 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));
@@ -973,9 +948,8 @@ void TabSupervisor::tabUserEvent(bool globalEvent)
         tab->setContentsChanged(true);
         setTabIcon(indexOf(tab), QPixmap("theme:icons/tab_changed"));
     }
-    if (globalEvent && SettingsCache::instance().getNotificationsEnabled()) {
+    if (globalEvent && SettingsCache::instance().getNotificationsEnabled())
         QApplication::alert(this);
-    }
 }
 
 void TabSupervisor::updateTabText(Tab *tab, const QString &newTabText)
@@ -988,50 +962,39 @@ 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)
 {
     QString senderName = QString::fromStdString(event.sender_name());
     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)) {
+                !userLevel.testFlag(ServerInfo_User::IsRegistered))
                 // Flags are additive, so reg/mod/admin are all IsRegistered
                 return;
-            } else if (SettingsCache::instance().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);
 }
 
@@ -1049,9 +1012,8 @@ 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)
@@ -1075,9 +1037,8 @@ void TabSupervisor::processUserJoined(const ServerInfo_User &userInfoJoined)
     }
 
     TabMessage *tab = messageTabs.value(userName);
-    if (tab) {
+    if (tab)
         tab->processUserJoined(userInfoJoined);
-    }
 }
 
 void TabSupervisor::updateCurrent(int index)
@@ -1090,9 +1051,8 @@ void TabSupervisor::updateCurrent(int index)
         }
         emit setMenu(static_cast<Tab *>(widget(index))->getTabMenus());
         tab->tabActivated();
-    } else {
+    } else
         emit setMenu();
-    }
 }
 
 /**
@@ -1102,9 +1062,8 @@ void TabSupervisor::updateCurrent(int index)
  */
 bool TabSupervisor::getAdminLocked() const
 {
-    if (!tabAdmin) {
+    if (!tabAdmin)
         return true;
-    }
     return tabAdmin->getLocked();
 }
 
@@ -1128,13 +1087,12 @@ 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: {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
index e77fb4f7b..0c4428f83 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
@@ -2,8 +2,8 @@
  * @file tab_supervisor.h
  * @ingroup Core
  * @ingroup Tabs
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TAB_SUPERVISOR_H
 #define TAB_SUPERVISOR_H
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 3112e7ada..5e8fb8670 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
@@ -1,19 +1,14 @@
 #include "tab_visual_database_display.h"
 
 #include "tab_deck_editor.h"
-#include "tab_supervisor.h"
-
-#include <libcockatrice/card/database/card_database_manager.h>
 
 TabVisualDatabaseDisplay::TabVisualDatabaseDisplay(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
 {
-    auto databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this);
-    databaseModel->setObjectName("databaseModel");
-
-    visualDatabaseDisplayWidget = new VisualDatabaseDisplayWidget(this, databaseModel);
-
-    connect(visualDatabaseDisplayWidget, &VisualDatabaseDisplayWidget::edhrecRequested, this,
-            &TabVisualDatabaseDisplay::openEdhrecTab);
+    deckEditor = new TabDeckEditor(_tabSupervisor);
+    deckEditor->setHidden(true);
+    visualDatabaseDisplayWidget = new VisualDatabaseDisplayWidget(
+        this, deckEditor, deckEditor->cardDatabaseDockWidget->databaseDisplayWidget->databaseModel,
+        deckEditor->cardDatabaseDockWidget->databaseDisplayWidget->databaseDisplayModel);
 
     setCentralWidget(visualDatabaseDisplayWidget);
 
@@ -23,8 +18,3 @@ 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 3a4bcd6ea..66f38fb3d 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
@@ -1,8 +1,8 @@
 /**
  * @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
@@ -15,18 +15,16 @@ 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->isVisualDisplayMode() ? tr("Visual Database Display")
-                                                                  : tr("Database Display");
+        return visualDatabaseDisplayWidget->displayModeButton->isChecked() ? tr("Database Display")
+                                                                           : tr("Visual 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 fd465ec21..d03ac483b 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,7 +1,6 @@
 #include "tab_deck_editor_visual.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "../../cards/card_info_display_widget.h"
 #include "../../deck_editor/deck_state_manager.h"
 #include "../../filters/filter_builder.h"
 #include "../../interface/pixel_map_generator.h"
@@ -26,7 +25,6 @@
 #include <QTimer>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
@@ -52,7 +50,6 @@ TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : Abstra
     refreshShortcuts();
 
     loadLayout();
-    filterDockWidget->setHidden(true);
     cardDatabaseDockWidget->setHidden(true);
 }
 
@@ -65,10 +62,9 @@ void TabDeckEditorVisual::createCentralFrame()
     centralFrame = new QVBoxLayout;
     centralWidget->setLayout(centralFrame);
 
-    auto databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this);
-    databaseModel->setObjectName("databaseModel");
-
-    tabContainer = new TabDeckEditorVisualTabWidget(centralWidget, this, deckStateManager->getModel(), databaseModel);
+    tabContainer = new TabDeckEditorVisualTabWidget(
+        centralWidget, this, deckStateManager->getModel(), cardDatabaseDockWidget->databaseDisplayWidget->databaseModel,
+        cardDatabaseDockWidget->databaseDisplayWidget->databaseDisplayModel);
 
     connect(tabContainer, &TabDeckEditorVisualTabWidget::cardChanged, this,
             &TabDeckEditorVisual::changeModelIndexAndCardInfo);
@@ -77,14 +73,7 @@ void TabDeckEditorVisual::createCentralFrame()
     connect(tabContainer, &TabDeckEditorVisualTabWidget::cardClicked, this,
             &TabDeckEditorVisual::processMainboardCardClick);
     connect(tabContainer, &TabDeckEditorVisualTabWidget::cardClickedDatabaseDisplay, this,
-            &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);
+            &TabDeckEditorVisual::processCardClickDatabaseDisplay);
 
     centralFrame->addWidget(tabContainer);
     setCentralWidget(centralWidget);
@@ -110,7 +99,7 @@ void TabDeckEditorVisual::createMenus()
 
     registerDockWidget(viewMenu, cardInfoDockWidget, {250, 500});
     registerDockWidget(viewMenu, deckDockWidget, {250, 360});
-    // registerDockWidget(viewMenu, filterDockWidget, {250, 250});
+    registerDockWidget(viewMenu, filterDockWidget, {250, 250});
     registerDockWidget(viewMenu, printingSelectorDockWidget, {525, 250});
 
     viewMenu->addSeparator();
@@ -127,9 +116,8 @@ void TabDeckEditorVisual::createMenus()
 QString TabDeckEditorVisual::getTabText() const
 {
     QString result = tr("Visual Deck: %1").arg(deckStateManager->getSimpleDeckName());
-    if (deckStateManager->isModified()) {
+    if (deckStateManager->isModified())
         result.prepend("* ");
-    }
     return result;
 }
 
@@ -153,10 +141,12 @@ void TabDeckEditorVisual::changeModelIndexToCard(const ExactCard &activeCard)
     }
 }
 
-void TabDeckEditorVisual::processMainboardCardClick(const QMouseEvent *event,
-                                                    const ExactCard &card,
+void TabDeckEditorVisual::processMainboardCardClick(QMouseEvent *event,
+                                                    CardInfoPictureWithTextOverlayWidget *instance,
                                                     const QString &zoneName)
 {
+    auto card = instance->getCard();
+
     // Get the model index for the card
     QModelIndex idx = deckStateManager->getModel()->findCard(card.getName(), zoneName);
     if (!idx.isValid()) {
@@ -176,14 +166,22 @@ void TabDeckEditorVisual::processMainboardCardClick(const QMouseEvent *event,
 
     // Alt + Right-click = decrement
     if (event->button() == Qt::RightButton && event->modifiers().testFlag(Qt::AltModifier)) {
-        decrementCard(card, zoneName);
+        if (zoneName == DECK_ZONE_MAIN) {
+            actDecrementCard(card);
+        } else {
+            actDecrementCardFromSideboard(card);
+        }
         //  Keep selection intact.
         return;
     }
 
     // Alt + Left click = increment
     if (event->button() == Qt::LeftButton && event->modifiers().testFlag(Qt::AltModifier)) {
-        addCard(card, zoneName);
+        if (zoneName == DECK_ZONE_MAIN) {
+            actAddCard(card);
+        } else {
+            actAddCardToSideboard(card);
+        }
         //  Keep selection intact.
         return;
     }
@@ -219,16 +217,13 @@ void TabDeckEditorVisual::processMainboardCardClick(const QMouseEvent *event,
 }
 
 /** @brief Handles clicks on cards in the database display. */
-void TabDeckEditorVisual::processDatabaseCardClick(const QMouseEvent *event, const ExactCard &card)
+void TabDeckEditorVisual::processCardClickDatabaseDisplay(QMouseEvent *event,
+                                                          CardInfoPictureWithTextOverlayWidget *instance)
 {
     if (event->button() == Qt::LeftButton) {
-        if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
-            addCard(card, DECK_ZONE_SIDE);
-        } else {
-            addCard(card, DECK_ZONE_MAIN);
-        }
+        actAddCard(instance->getCard());
     } else if (event->button() == Qt::RightButton) {
-        decrementCard(card, DECK_ZONE_MAIN);
+        actDecrementCard(instance->getCard());
     } else if (event->button() == Qt::MiddleButton) {
         deckDockWidget->actRemoveCard();
     }
@@ -243,6 +238,14 @@ bool TabDeckEditorVisual::actSaveDeckAs()
     return result;
 }
 
+/** @brief Shows the printing selector dock and updates it with the current card. */
+void TabDeckEditorVisual::showPrintingSelector()
+{
+    printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr());
+    printingSelectorDockWidget->printingSelector->updateDisplay();
+    printingSelectorDockWidget->setVisible(true);
+}
+
 /** @brief Refreshes keyboard shortcuts for this tab from settings. */
 void TabDeckEditorVisual::refreshShortcuts()
 {
@@ -272,18 +275,18 @@ void TabDeckEditorVisual::restartLayout()
 
     deckDockWidget->setVisible(true);
     cardInfoDockWidget->setVisible(true);
-    // filterDockWidget->setVisible(false);
+    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);
 
     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()));
 }
@@ -295,13 +298,13 @@ void TabDeckEditorVisual::retranslateUi()
 
     cardInfoDockWidget->setWindowTitle(tr("Card Info"));
     deckDockWidget->setWindowTitle(tr("Deck"));
-    // filterDockWidget->setWindowTitle(tr("Filters"));
+    filterDockWidget->setWindowTitle(tr("Filters"));
 
     viewMenu->setTitle(tr("&View"));
 
     dockToActions[cardInfoDockWidget].menu->setTitle(tr("Card Info"));
     dockToActions[deckDockWidget].menu->setTitle(tr("Deck"));
-    // dockToActions[filterDockWidget].menu->setTitle(tr("Filters"));
+    dockToActions[filterDockWidget].menu->setTitle(tr("Filters"));
     dockToActions[printingSelectorDockWidget].menu->setTitle(tr("Printing"));
 
     for (auto &actions : dockToActions.values()) {
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 7d7a3f3a2..8a0677c9d 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
@@ -41,7 +41,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.
- * - processDatabaseCardClick(QMouseEvent *event, ...) — Handles clicks on database cards.
+ * - processCardClickDatabaseDisplay(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.
@@ -144,20 +144,27 @@ 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 card The clicked card.
+     * @param instance Widget representing the clicked card.
      * @param zoneName Deck zone of the card.
      */
-    void processMainboardCardClick(const QMouseEvent *event, const ExactCard &card, const QString &zoneName);
+    void processMainboardCardClick(QMouseEvent *event,
+                                   CardInfoPictureWithTextOverlayWidget *instance,
+                                   const QString &zoneName);
 
     /**
      * @brief Handle card clicks in the database visual display.
      * @param event Mouse event triggering the action.
-     * @param card  The clicked card.
+     * @param instance Widget representing the clicked card.
      */
-    void processDatabaseCardClick(const QMouseEvent *event, const ExactCard &card);
+    void processCardClickDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
 
     /**
      * @brief Save the deck under a new name.
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 2ee560859..82aeb05a6 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
@@ -9,6 +9,7 @@
  * @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.
@@ -16,8 +17,10 @@
 TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent,
                                                            AbstractTabDeckEditor *_deckEditor,
                                                            DeckListModel *_deckModel,
-                                                           CardDatabaseModel *_cardDatabaseModel)
-    : QTabWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), cardDatabaseModel(_cardDatabaseModel)
+                                                           CardDatabaseModel *_cardDatabaseModel,
+                                                           CardDatabaseDisplayModel *_cardDatabaseDisplayModel)
+    : QTabWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), cardDatabaseModel(_cardDatabaseModel),
+      cardDatabaseDisplayModel(_cardDatabaseDisplayModel)
 {
     this->setTabsClosable(true); // Enable tab closing
     connect(this, &QTabWidget::tabCloseRequested, this, &TabDeckEditorVisualTabWidget::handleTabClose);
@@ -31,25 +34,16 @@ TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent,
             &TabDeckEditorVisualTabWidget::onCardChanged);
     connect(visualDeckView, &VisualDeckEditorWidget::cardClicked, this,
             &TabDeckEditorVisualTabWidget::onCardClickedDeckEditor);
-    connect(visualDeckView, &VisualDeckEditorWidget::cardAdditionRequested, this,
-            &TabDeckEditorVisualTabWidget::actAddCard);
+    connect(visualDeckView, &VisualDeckEditorWidget::cardAdditionRequested, deckEditor,
+            &AbstractTabDeckEditor::actAddCard);
 
-    visualDatabaseDisplay = new VisualDatabaseDisplayWidget(this, _cardDatabaseModel, deckModel);
+    visualDatabaseDisplay =
+        new VisualDatabaseDisplayWidget(this, deckEditor, _cardDatabaseModel, _cardDatabaseDisplayModel);
     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);
 
     statsAnalyzer = new DeckListStatisticsAnalyzer(this, deckModel);
     statsAnalyzer->analyze();
@@ -63,8 +57,6 @@ TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent,
     this->addNewTab(visualDatabaseDisplay, tr("Visual Database Display"));
     this->addNewTab(deckAnalytics, tr("Deck Analytics"));
     this->addNewTab(sampleHandWidget, tr("Sample Hand"));
-
-    setTabsClosable(false);
 }
 
 /**
@@ -88,24 +80,25 @@ 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 card The clicked card.
+ * @param instance The widget instance of the clicked card.
  * @param zoneName The zone of the deck where the card is located.
  */
 void TabDeckEditorVisualTabWidget::onCardClickedDeckEditor(QMouseEvent *event,
-                                                           const ExactCard &card,
-                                                           const QString &zoneName)
+                                                           CardInfoPictureWithTextOverlayWidget *instance,
+                                                           QString zoneName)
 {
-    emit cardClicked(event, card, zoneName);
+    emit cardClicked(event, instance, zoneName);
 }
 
 /**
  * @brief Emits the cardClickedDatabaseDisplay signal when a card is clicked in the database display.
  * @param event The mouse event.
- * @param card The clicked card.
+ * @param instance The widget instance of the clicked card.
  */
-void TabDeckEditorVisualTabWidget::onCardClickedDatabaseDisplay(QMouseEvent *event, const ExactCard &card)
+void TabDeckEditorVisualTabWidget::onCardClickedDatabaseDisplay(QMouseEvent *event,
+                                                                CardInfoPictureWithTextOverlayWidget *instance)
 {
-    emit cardClickedDatabaseDisplay(event, card);
+    emit cardClickedDatabaseDisplay(event, instance);
 }
 
 /**
@@ -171,15 +164,3 @@ 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 2aabbb26a..9468df425 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
@@ -55,25 +55,27 @@ public:
      * @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);
+                                          CardDatabaseModel *_cardDatabaseModel,
+                                          CardDatabaseDisplayModel *_cardDatabaseDisplayModel);
 
-    /** @brief Add a new tab with a widget and title. */
+    /// Add a new tab with a widget and title.
     void addNewTab(QWidget *widget, const QString &title);
 
-    /** @brief Remove the currently active tab. */
+    /// Remove the currently active tab.
     void removeCurrentTab();
 
-    /** @brief Set the title of a specific tab. */
+    /// Set the title of a specific tab.
     void setTabTitle(int index, const QString &title);
 
-    /** @brief Get the currently active tab widget. */
+    /// Get the currently active tab widget.
     [[nodiscard]] QWidget *getCurrentTab() const;
 
-    /** @brief Get the total number of tabs. */
+    /// Get the total number of tabs.
     [[nodiscard]] int getTabCount() const;
 
     VisualDeckEditorWidget *visualDeckView; ///< Visual deck editor widget.
@@ -99,35 +101,30 @@ public slots:
     /**
      * @brief Emitted when a card is clicked in the deck view.
      * @param event Mouse event.
-     * @param card The clicked card.
+     * @param instance Widget representing the clicked card.
      * @param zoneName Deck zone of the card.
      */
-    void onCardClickedDeckEditor(QMouseEvent *event, const ExactCard &card, const QString &zoneName);
+    void onCardClickedDeckEditor(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
 
     /**
      * @brief Emitted when a card is clicked in the database display.
      * @param event Mouse event.
-     * @param card The clicked card.
+     * @param instance Widget representing the clicked card.
      */
-    void onCardClickedDatabaseDisplay(QMouseEvent *event, const ExactCard &card);
+    void onCardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
 
 signals:
     void cardChanged(const ExactCard &activeCard);
     void cardChangedDatabaseDisplay(const ExactCard &activeCard);
-    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);
+    void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
+    void cardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
 
 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.
+    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.
 
 private slots:
     /**
@@ -135,12 +132,6 @@ 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.h b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h
index d3f64e23d..ccf752e67 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,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/interface/widgets/utility/compact_push_button.cpp b/cockatrice/src/interface/widgets/utility/compact_push_button.cpp
deleted file mode 100644
index cf98bfede..000000000
--- a/cockatrice/src/interface/widgets/utility/compact_push_button.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-#include "compact_push_button.h"
-
-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
deleted file mode 100644
index b0017beee..000000000
--- a/cockatrice/src/interface/widgets/utility/compact_push_button.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef COCKATRICE_COMPACT_PUSH_BUTTON_H
-#define COCKATRICE_COMPACT_PUSH_BUTTON_H
-
-#include <QPushButton>
-
-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/custom_line_edit.cpp b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
index 05f56c275..c137b4f35 100644
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
+++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
@@ -24,18 +24,14 @@ 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();
 
@@ -43,9 +39,8 @@ 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;
 }
@@ -84,12 +79,10 @@ 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 8c389b797..2026c1c1c 100644
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.h
+++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.h
@@ -1,8 +1,8 @@
 /**
  * @file custom_line_edit.h
  * @ingroup UI
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef CUSTOMLINEEDIT_H
 #define CUSTOMLINEEDIT_H
diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
index 13f475a61..389e69d57 100644
--- a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
+++ b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
@@ -46,9 +46,8 @@ void LineEditCompleter::keyPressEvent(QKeyEvent *event)
                 int lastIndexof = qMax(0, textValue.lastIndexOf(" "));
                 QString finalString = textValue.left(lastIndexof);
                 // Add a space if there's a word
-                if (finalString != "") {
+                if (finalString != "")
                     finalString += " ";
-                }
                 setText(finalString);
                 return;
             }
@@ -122,14 +121,12 @@ void LineEditCompleter::setCompleter(QCompleter *completer)
 
 void LineEditCompleter::setCompletionList(QStringList completionList)
 {
-    if (!c || c->popup()->isVisible()) {
+    if (!c || c->popup()->isVisible())
         return;
-    }
 
     QStringListModel *model;
     model = (QStringListModel *)(c->model());
-    if (model == NULL) {
+    if (model == NULL)
         model = new QStringListModel();
-    }
     model->setStringList(completionList);
 }
diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.h b/cockatrice/src/interface/widgets/utility/line_edit_completer.h
index 65fa382ac..7b3756e3c 100644
--- a/cockatrice/src/interface/widgets/utility/line_edit_completer.h
+++ b/cockatrice/src/interface/widgets/utility/line_edit_completer.h
@@ -1,8 +1,8 @@
 /**
  * @file line_edit_completer.h
  * @ingroup UI
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef LINEEDITCOMPLETER_H
 #define LINEEDITCOMPLETER_H
diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.h b/cockatrice/src/interface/widgets/utility/sequence_edit.h
index 28e18d42f..a5fe1a1c6 100644
--- a/cockatrice/src/interface/widgets/utility/sequence_edit.h
+++ b/cockatrice/src/interface/widgets/utility/sequence_edit.h
@@ -1,8 +1,8 @@
 /**
  * @file sequence_edit.h
  * @ingroup UI
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef SEQUENCEEDIT_H
 #define SEQUENCEEDIT_H
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h
index 497d25fce..698ea9e97 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,8 +1,8 @@
 /**
  * @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
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
deleted file mode 100644
index 5d9f7f944..000000000
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_button.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#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 7ee57b1e9..44b275afd 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
@@ -57,9 +57,8 @@ 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";
 
@@ -89,22 +88,19 @@ void VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter(const QString &filena
     QString filePath = SettingsCache::instance().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();
 
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 459633e42..bb5921a02 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,8 +1,8 @@
 /**
  * @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
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
index 62e1bf5ba..3cc1bf23b 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
@@ -1,15 +1,20 @@
 #include "visual_database_display_filter_toolbar_widget.h"
 
-#include "../deck_editor/card_database_view.h"
 #include "visual_database_display_widget.h"
 
 #include <QGroupBox>
 
-VisualDatabaseDisplayFilterToolbarWidget::VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *_parent,
-                                                                                   DeckListModel *deckListModel)
-    : FlowWidget(_parent, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff),
-      visualDatabaseDisplay(_parent), deckListModel(deckListModel)
+VisualDatabaseDisplayFilterToolbarWidget::VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *_parent)
+    : QWidget(_parent), visualDatabaseDisplay(_parent)
 {
+    filterContainerLayout = new QHBoxLayout(this);
+    filterContainerLayout->setContentsMargins(11, 0, 11, 0);
+    filterContainerLayout->setSpacing(2);
+    setLayout(filterContainerLayout);
+    filterContainerLayout->setAlignment(Qt::AlignLeft);
+
+    setMaximumHeight(80);
+
     connect(this, &VisualDatabaseDisplayFilterToolbarWidget::searchModelChanged, visualDatabaseDisplay,
             &VisualDatabaseDisplayWidget::onSearchModelChanged);
 
@@ -96,10 +101,11 @@ void VisualDatabaseDisplayFilterToolbarWidget::initialize()
     filterLayout->setAlignment(Qt::AlignLeft);
 
     // create settings widgets
-    auto filterModel = visualDatabaseDisplay->getFilterModel();
+    auto filterModel = visualDatabaseDisplay->filterModel;
 
     saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel);
-    nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, filterModel, deckListModel);
+    nameFilterWidget =
+        new VisualDatabaseDisplayNameFilterWidget(this, visualDatabaseDisplay->getDeckEditor(), filterModel);
     mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel);
     formatLegalityWidget = new VisualDatabaseDisplayFormatLegalityFilterWidget(this, filterModel);
     subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel);
@@ -125,18 +131,10 @@ void VisualDatabaseDisplayFilterToolbarWidget::initialize()
     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();
+    filterContainerLayout->addWidget(sortGroupBox);
+    filterContainerLayout->addWidget(filterGroupBox);
+    filterContainerLayout->addStretch();
+    filterContainerLayout->addWidget(quickFilterSaveLoadWidget);
 }
 
 void VisualDatabaseDisplayFilterToolbarWidget::retranslateUi()
@@ -157,26 +155,4 @@ void VisualDatabaseDisplayFilterToolbarWidget::retranslateUi()
     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
index 8a3555455..5cca5187a 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h
@@ -10,7 +10,7 @@
 
 class VisualDatabaseDisplayWidget;
 
-class VisualDatabaseDisplayFilterToolbarWidget : public FlowWidget
+class VisualDatabaseDisplayFilterToolbarWidget : public QWidget
 {
     Q_OBJECT
 
@@ -18,14 +18,12 @@ signals:
     void searchModelChanged();
 
 public:
-    explicit VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *parent,
-                                                      DeckListModel *deckListModel = nullptr);
+    explicit VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *parent);
     void initialize();
     void retranslateUi();
 
 private:
     VisualDatabaseDisplayWidget *visualDatabaseDisplay;
-    DeckListModel *deckListModel;
 
     QGroupBox *sortGroupBox;
     QLabel *sortByLabel;
@@ -34,6 +32,7 @@ private:
     QGroupBox *filterGroupBox;
     QLabel *filterByLabel;
 
+    QHBoxLayout *filterContainerLayout;
     SettingsButtonWidget *quickFilterSaveLoadWidget;
     VisualDatabaseDisplayFilterSaveLoadWidget *saveLoadWidget;
     SettingsButtonWidget *quickFilterNameWidget;
@@ -46,12 +45,6 @@ private:
     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
index 633f07af7..0df948016 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
@@ -1,7 +1,6 @@
 #include "visual_database_display_format_legality_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
-#include "visual_database_display_filter_button.h"
 
 #include <QLabel>
 #include <QPushButton>
@@ -81,7 +80,8 @@ void VisualDatabaseDisplayFormatLegalityFilterWidget::createFormatButtons()
     for (auto it = allFormatsWithCount.begin(); it != allFormatsWithCount.end(); ++it) {
         auto *button = new QPushButton(it.key(), flowWidget);
         button->setCheckable(true);
-        button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
+        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
+                              "QPushButton:checked { background-color: green; color: white; }");
 
         flowWidget->addWidget(button);
         formatButtons[it.key()] = button;
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 c44489c1b..bc8e914bd 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,7 +1,6 @@
 #include "visual_database_display_main_type_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
-#include "visual_database_display_filter_button.h"
 
 #include <QLabel>
 #include <QPushButton>
@@ -76,8 +75,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(visualDatabaseDisplayFilterButtonStyle);
+        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
+                              "QPushButton:checked { background-color: green; color: white; }");
 
         flowWidget->addWidget(button);
         typeButtons[it.key()] = button;
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 6dec58319..9145812a7 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,8 +1,8 @@
 /**
  * @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
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 3fa1a782a..5098696dd 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
@@ -3,14 +3,13 @@
 #include "../../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "../deck_editor/deck_state_manager.h"
-#include "visual_database_display_filter_button.h"
 
 #include <QHBoxLayout>
 
 VisualDatabaseDisplayNameFilterWidget::VisualDatabaseDisplayNameFilterWidget(QWidget *parent,
-                                                                             FilterTreeModel *_filterModel,
-                                                                             DeckListModel *deckListModel)
-    : QWidget(parent), filterModel(_filterModel), deckListModel(deckListModel)
+                                                                             AbstractTabDeckEditor *_deckEditor,
+                                                                             FilterTreeModel *_filterModel)
+    : QWidget(parent), deckEditor(_deckEditor), filterModel(_filterModel)
 {
     setMinimumWidth(300);
     setMaximumHeight(300);
@@ -62,9 +61,10 @@ void VisualDatabaseDisplayNameFilterWidget::retranslateUi()
 
 void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck()
 {
-    if (!deckListModel) {
+    DeckListModel *deckListModel = deckEditor->deckStateManager->getModel();
+
+    if (!deckListModel)
         return;
-    }
 
     QList<QString> cardNames = deckListModel->getCardNames();
     for (auto cardName : cardNames) {
@@ -77,9 +77,8 @@ void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck()
 void VisualDatabaseDisplayNameFilterWidget::actLoadFromClipboard()
 {
     DlgLoadDeckFromClipboard dlg(this);
-    if (!dlg.exec()) {
+    if (!dlg.exec())
         return;
-    }
 
     QStringList cardsInClipboard = dlg.getDeckList().getCardList();
     for (QString cardName : cardsInClipboard) {
@@ -91,14 +90,13 @@ 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(visualDatabaseDisplayFilterButtonStyle);
+    button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
+                          "QPushButton:hover { background-color: red; color: white; }");
 
     connect(button, &QPushButton::clicked, this, [this, name]() {
         removeNameFilter(name);
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 0c10408ae..76d3ec29e 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,8 +1,8 @@
 /**
  * @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
@@ -21,8 +21,8 @@ class VisualDatabaseDisplayNameFilterWidget : public QWidget
     Q_OBJECT
 public:
     explicit VisualDatabaseDisplayNameFilterWidget(QWidget *parent,
-                                                   FilterTreeModel *filterModel,
-                                                   DeckListModel *deckListModel = nullptr);
+                                                   AbstractTabDeckEditor *deckEditor,
+                                                   FilterTreeModel *filterModel);
 
     void createNameFilter(const QString &name);
     void removeNameFilter(const QString &name);
@@ -34,8 +34,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 b72116461..3339bc561 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,7 +2,6 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../filters/filter_tree_model.h"
-#include "visual_database_display_filter_button.h"
 
 #include <QLineEdit>
 #include <QPushButton>
@@ -102,8 +101,8 @@ void VisualDatabaseDisplaySetFilterWidget::createSetButtons()
 
         auto *button = new QPushButton(longName + " (" + shortName + ")", flowWidget);
         button->setCheckable(true);
-
-        button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
+        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
+                              "QPushButton:checked { background-color: green; color: white; }");
 
         flowWidget->addWidget(button);
         setButtons[shortName] = button;
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 bcc5e93c2..dc7fd0e92 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,8 +1,8 @@
 /**
  * @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
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 6d4bcb58e..57559d12c 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,7 +1,6 @@
 #include "visual_database_display_sub_type_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
-#include "visual_database_display_filter_button.h"
 
 #include <QLabel>
 #include <QLineEdit>
@@ -81,8 +80,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(visualDatabaseDisplayFilterButtonStyle);
+        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
+                              "QPushButton:checked { background-color: green; color: white; }");
 
         flowWidget->addWidget(button);
         typeButtons[it.key()] = button;
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 d713c7f99..ce5546fc8 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,8 +1,8 @@
 /**
  * @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
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 cc4cce496..44a9e98a0 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
@@ -5,7 +5,7 @@
 #include "../../../filters/syntax_help.h"
 #include "../../pixel_map_generator.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
-#include "../deck_editor/card_database_view.h"
+#include "../quick_settings/settings_button_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"
@@ -23,21 +23,12 @@
 #include <utility>
 
 VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
+                                                         AbstractTabDeckEditor *_deckEditor,
                                                          CardDatabaseModel *database_model,
-                                                         DeckListModel *deckListModel)
-    : QWidget(parent)
+                                                         CardDatabaseDisplayModel *database_display_model)
+    : QWidget(parent), deckEditor(_deckEditor), databaseModel(database_model),
+      databaseDisplayModel(database_display_model)
 {
-    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);
-
     cards = new QList<ExactCard>;
     connect(databaseDisplayModel, &CardDatabaseDisplayModel::modelDirty, this,
             &VisualDatabaseDisplayWidget::modelDirty);
@@ -55,7 +46,9 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
             &SettingsCache::setVisualDatabaseDisplayCardSize);
 
-    searchContainer = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
+    searchContainer = new QWidget(this);
+    searchLayout = new QHBoxLayout(searchContainer);
+    searchContainer->setLayout(searchLayout);
 
     searchEdit = new SearchLineEdit();
     searchEdit->setObjectName("searchEdit");
@@ -64,6 +57,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
     auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition);
     connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); });
+    searchEdit->installEventFilter(&searchKeySignals);
 
     setFocusProxy(searchEdit);
     setFocusPolicy(Qt::ClickFocus);
@@ -78,29 +72,38 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     filterModel = new FilterTreeModel();
     filterModel->setObjectName("filterModel");
 
-    connect(searchEdit, &SearchLineEdit::textChanged, databaseDisplayModel, &CardDatabaseDisplayModel::setStringFilter);
+    searchKeySignals.setObjectName("searchKeySignals");
+    connect(searchEdit, &SearchLineEdit::textChanged, this, &VisualDatabaseDisplayWidget::updateSearch);
 
-    databaseView = new CardDatabaseView(this, databaseDisplayModel);
-    databaseView->setObjectName("databaseView");
+    DeckEditorDatabaseDisplayWidget *databaseDisplayWidget = deckEditor->cardDatabaseDockWidget->databaseDisplayWidget;
+    connect(&searchKeySignals, &KeySignals::onEnter, databaseDisplayWidget,
+            &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
+    connect(&searchKeySignals, &KeySignals::onCtrlAltEqual, databaseDisplayWidget,
+            &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
+    connect(&searchKeySignals, &KeySignals::onCtrlAltRBracket, databaseDisplayWidget,
+            &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
+    connect(&searchKeySignals, &KeySignals::onCtrlAltMinus, databaseDisplayWidget,
+            &DeckEditorDatabaseDisplayWidget::actDecrementCardFromMainDeck);
+    connect(&searchKeySignals, &KeySignals::onCtrlAltLBracket, databaseDisplayWidget,
+            &DeckEditorDatabaseDisplayWidget::actDecrementCardFromSideboard);
+    connect(&searchKeySignals, &KeySignals::onCtrlAltEnter, databaseDisplayWidget,
+            &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
+    connect(&searchKeySignals, &KeySignals::onCtrlEnter, databaseDisplayWidget,
+            &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
+    connect(&searchKeySignals, &KeySignals::onCtrlC, databaseDisplayWidget,
+            &DeckEditorDatabaseDisplayWidget::copyDatabaseCellContents);
+    connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); });
+
+    databaseView = databaseDisplayWidget->getDatabaseView();
     databaseView->setFocusProxy(searchEdit);
     databaseView->setItemDelegate(nullptr);
     databaseView->setVisible(false);
 
     searchEdit->setTreeView(databaseView);
-    searchEdit->installEventFilter(databaseView->getKeySignals());
-
-    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 VisualDatabaseDisplayFilterToolbarWidget(this, deckListModel);
+    filterContainer = new VisualDatabaseDisplayFilterToolbarWidget(this);
 
     clearFilterWidget = new QToolButton();
     clearFilterWidget->setFixedSize(32, 32);
@@ -129,8 +132,6 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
         databaseLoadIndicator->setVisible(false);
     }
 
-    QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar();
-    connect(scrollBar, &QScrollBar::valueChanged, [this](int /*value*/) { loadCurrentPage(); });
     retranslateUi();
 }
 
@@ -139,12 +140,11 @@ void VisualDatabaseDisplayWidget::initialize()
     databaseLoadIndicator->setVisible(false);
 
     filterContainer->initialize();
-    filterContainer->setVisible(true);
 
-    searchContainer->addWidget(colorFilterWidget);
-    searchContainer->addWidget(clearFilterWidget);
-    searchContainer->addWidget(searchEdit);
-    searchContainer->addWidget(displayModeButton);
+    searchLayout->addWidget(colorFilterWidget);
+    searchLayout->addWidget(clearFilterWidget);
+    searchLayout->addWidget(searchEdit);
+    searchLayout->addWidget(displayModeButton);
 
     mainLayout->addWidget(searchContainer);
 
@@ -156,6 +156,11 @@ void VisualDatabaseDisplayWidget::initialize()
 
     mainLayout->addWidget(cardSizeWidget);
 
+    debounceTimer = new QTimer(this);
+    debounceTimer->setSingleShot(true); // Ensure it only fires once after the timeout
+
+    connect(debounceTimer, &QTimer::timeout, this, &VisualDatabaseDisplayWidget::onSearchModelChanged);
+
     databaseDisplayModel->setFilterTree(filterModel->filterTree());
 
     connect(filterModel, &FilterTreeModel::layoutChanged, this, &VisualDatabaseDisplayWidget::onSearchModelChanged);
@@ -175,11 +180,6 @@ void VisualDatabaseDisplayWidget::retranslateUi()
     clearFilterWidget->setToolTip(tr("Clear all filters"));
 }
 
-void VisualDatabaseDisplayWidget::highlightAllSearchEdit()
-{
-    searchEdit->setSelection(0, searchEdit->text().length());
-}
-
 void VisualDatabaseDisplayWidget::resizeEvent(QResizeEvent *event)
 {
     QWidget::resizeEvent(event);
@@ -205,9 +205,9 @@ void VisualDatabaseDisplayWidget::onDisplayModeChanged(bool checked)
     }
 }
 
-void VisualDatabaseDisplayWidget::onClick(QMouseEvent *event, const ExactCard &card)
+void VisualDatabaseDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance)
 {
-    emit cardClickedDatabaseDisplay(event, card);
+    emit cardClickedDatabaseDisplay(event, instance);
 }
 
 void VisualDatabaseDisplayWidget::onHover(const ExactCard &hoveredCard)
@@ -215,21 +215,25 @@ void VisualDatabaseDisplayWidget::onHover(const ExactCard &hoveredCard)
     emit cardHoveredDatabaseDisplay(hoveredCard);
 }
 
-void VisualDatabaseDisplayWidget::addCardToDisplay(const ExactCard &cardToAdd)
+void VisualDatabaseDisplayWidget::addCard(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::cardClicked, this, &VisualDatabaseDisplayWidget::onClick);
+    connect(display, &CardInfoPictureWithTextOverlayWidget::imageClicked, this, &VisualDatabaseDisplayWidget::onClick);
     connect(display, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &VisualDatabaseDisplayWidget::onHover);
     connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, display, &CardInfoPictureWidget::setScaleFactor);
 }
 
-bool VisualDatabaseDisplayWidget::isVisualDisplayMode() const
+void VisualDatabaseDisplayWidget::updateSearch(const QString &search) const
 {
-    return !displayModeButton->isChecked();
+    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 VisualDatabaseDisplayWidget::onSearchModelChanged()
@@ -239,8 +243,9 @@ void VisualDatabaseDisplayWidget::onSearchModelChanged()
         flowWidget->clearLayout(); // Clear existing cards
         cards->clear();            // Clear the card list
         // Reset scrollbar position to the top after loading new cards
-        QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar();
-        scrollBar->setValue(0); // Reset scrollbar to top
+        if (QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar()) {
+            scrollBar->setValue(0); // Reset scrollbar to top
+        }
 
         currentPage = 0;
         loadCurrentPage();
@@ -248,44 +253,6 @@ void VisualDatabaseDisplayWidget::onSearchModelChanged()
     }
 }
 
-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
@@ -293,7 +260,7 @@ void VisualDatabaseDisplayWidget::loadCurrentPage()
         // Only load the first page initially
         qCDebug(VisualDatabaseDisplayLog) << "Loading the first page";
         populateCards();
-    } else if (nearEndOfPage()) {
+    } else {
         // If not the first page, just load the next page and append to the flow widget
         loadNextPage();
     }
@@ -318,9 +285,7 @@ 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)
@@ -338,12 +303,12 @@ void VisualDatabaseDisplayWidget::loadPage(int start, int end)
                 for (const CardFilter *setFilter : setFilters) {
                     if (setMap.contains(setFilter->term())) {
                         for (PrintingInfo printing : setMap[setFilter->term()]) {
-                            addCardToDisplay(ExactCard(info, printing));
+                            addCard(ExactCard(info, printing));
                         }
                     }
                 }
             } else {
-                addCardToDisplay(CardDatabaseManager::query()->getPreferredCard(info));
+                addCard(CardDatabaseManager::query()->getPreferredCard(info));
             }
         } else {
             qCDebug(VisualDatabaseDisplayLog) << "Card not found in database!";
@@ -372,3 +337,23 @@ 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 a383e8ead..3aa8d7f8e 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,8 +1,8 @@
 /**
  * @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
@@ -34,8 +34,9 @@ class VisualDatabaseDisplayWidget : public QWidget
 
 public:
     explicit VisualDatabaseDisplayWidget(QWidget *parent,
+                                         AbstractTabDeckEditor *deckEditor,
                                          CardDatabaseModel *database_model,
-                                         DeckListModel *deckListModel = nullptr);
+                                         CardDatabaseDisplayModel *database_display_model);
     void retranslateUi();
 
     void adjustCardsPerPage();
@@ -46,66 +47,56 @@ public:
     void sortCardList(const QStringList &properties, Qt::SortOrder order) const;
     void setDeckList(const DeckList &new_deck_list_model);
 
+    AbstractTabDeckEditor *getDeckEditor()
+    {
+        return deckEditor;
+    }
+
     CardDatabaseDisplayModel *getDatabaseDisplayModel()
     {
         return databaseDisplayModel;
     }
 
-    CardDatabaseView *getDatabaseView()
+    QTreeView *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;
+    QWidget *searchContainer;
+    QHBoxLayout *searchLayout;
     SearchLineEdit *searchEdit;
     QPushButton *displayModeButton;
     FilterTreeModel *filterModel;
     VisualDatabaseDisplayColorFilterWidget *colorFilterWidget;
 
+public slots:
+    void onSearchModelChanged();
+
+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;
 
     QToolButton *clearFilterWidget;
     VisualDatabaseDisplayFilterToolbarWidget *filterContainer;
+    KeySignals searchKeySignals;
+    AbstractTabDeckEditor *deckEditor;
+    CardDatabaseModel *databaseModel;
     CardDatabaseDisplayModel *databaseDisplayModel;
-    CardDatabaseView *databaseView;
+    QTreeView *databaseView;
     QList<ExactCard> *cards;
     QVBoxLayout *mainLayout;
     QScrollArea *scrollArea;
@@ -121,9 +112,6 @@ private:
     int currentPage = 0;    // Current page index
     int cardsPerPage = 100; // Number of cards per page
 
-    void highlightAllSearchEdit();
-    bool nearEndOfPage() const;
-
 protected:
     void resizeEvent(QResizeEvent *event) override;
 };
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 5fe29fa2d..05bf43118 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,8 +1,8 @@
 /**
  * @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
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 f44c9c3ef..79a98fda6 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
@@ -72,7 +72,7 @@ VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent)
     sortCriteriaButton->addSettingsWidget(sortLabel);
     sortCriteriaButton->addSettingsWidget(sortByListWidget);
 
-    displayTypeButton = new CompactPushButton(this);
+    displayTypeButton = new QPushButton(this);
     connect(displayTypeButton, &QPushButton::clicked, this, &VisualDeckDisplayOptionsWidget::updateDisplayType);
 
     groupAndSortLayout->addWidget(groupByLabel);
@@ -91,8 +91,7 @@ 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->setButtonText(tr("Toggle Layout: Overlap"));
-    displayTypeButton->setButtonIcon(QPixmap("theme:icons/scales"));
+    displayTypeButton->setText(tr("Toggle Layout: Overlap"));
     displayTypeButton->setToolTip(
         tr("Change how cards are displayed within zones (i.e. overlapped or fully visible.)"));
 }
@@ -116,32 +115,11 @@ void VisualDeckDisplayOptionsWidget::updateDisplayType()
     // Update UI and emit signal
     switch (currentDisplayType) {
         case DisplayType::Flat:
-            displayTypeButton->setButtonText(tr("Toggle Layout: Flat"));
-            displayTypeButton->setButtonIcon(QPixmap("theme:icons/scroll"));
+            displayTypeButton->setText(tr("Toggle Layout: Flat"));
             break;
         case DisplayType::Overlap:
-            displayTypeButton->setButtonText(tr("Toggle Layout: Overlap"));
-            displayTypeButton->setButtonIcon(QPixmap("theme:icons/scales"));
+            displayTypeButton->setText(tr("Toggle Layout: Overlap"));
             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 bc11884df..7a447753f 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
@@ -53,9 +53,6 @@ public slots:
      * Called when the application language changes.
      */
     void retranslateUi();
-    void updateCompactMode(bool mode);
-    int expandedWidth() const;
-    int compactWidth() const;
 
 public:
     /**
@@ -104,37 +101,37 @@ private slots:
     void updateDisplayType();
 
 private:
-    /** @brief Layout for grouping and sorting UI elements. */
+    /// Layout for grouping and sorting UI elements.
     QHBoxLayout *groupAndSortLayout;
 
-    /** @brief Current deck display type. */
+    /// Current deck display type.
     DisplayType currentDisplayType = DisplayType::Overlap;
 
-    /** @brief Button used to toggle the display layout. */
-    CompactPushButton *displayTypeButton;
+    /// Button used to toggle the display layout.
+    QPushButton *displayTypeButton;
 
-    /** @brief Label for the group-by selector. */
+    /// Label for the group-by selector.
     QLabel *groupByLabel;
 
-    /** @brief Combo box listing group-by criteria. */
+    /// Combo box listing group-by criteria.
     QComboBox *groupByComboBox;
 
-    /** @brief Currently active group-by criterion. */
+    /// Currently active group-by criterion.
     QString activeGroupCriteria = "maintype";
 
-    /** @brief Encapsulates the sort settings widgets (label + list). */
+    /// Encapsulates the sort settings widgets (label + list).
     SettingsButtonWidget *sortCriteriaButton;
 
-    /** @brief Label for "Sort by". */
+    /// Label for “Sort by”.
     QLabel *sortByLabel;
 
-    /** @brief Descriptive label inside the sort criteria button. */
+    /// Descriptive label inside the sort criteria button.
     QLabel *sortLabel;
 
-    /** @brief Draggable list of sort criteria. */
+    /// Draggable list of sort criteria.
     QListWidget *sortByListWidget;
 
-    /** @brief Ordered list of current sort criteria. */
+    /// 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_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
index 8417ffa34..cc35372b0 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
@@ -112,15 +112,13 @@ static QList<ExactCard> cardNodesToExactCards(QList<const DecklistCardNode *> no
 QList<ExactCard> VisualDeckEditorSampleHandWidget::getRandomCards(int amountToGet)
 {
     QList<ExactCard> randomCards;
-    if (!deckListModel) {
+    if (!deckListModel)
         return randomCards;
-    }
 
     QList<ExactCard> mainDeckCards = cardNodesToExactCards(deckListModel->getCardNodesForZone(DECK_ZONE_MAIN));
 
-    if (mainDeckCards.isEmpty()) {
+    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 c6c07dd55..c63c74a4d 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,8 +1,8 @@
 /**
  * @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
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 815892f4c..e957eb304 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
@@ -9,7 +9,6 @@
 #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 "visual_deck_display_options_widget.h"
 
 #include <QCheckBox>
@@ -70,17 +69,10 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
 
 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);
+    searchBar = new QLineEdit(this);
     connect(searchBar, &QLineEdit::returnPressed, this, [=, this]() {
-        if (!searchBar->hasFocus()) {
+        if (!searchBar->hasFocus())
             return;
-        }
 
         ExactCard card = CardDatabaseManager::query()->getCard({searchBar->text()});
         if (card) {
@@ -88,8 +80,6 @@ void VisualDeckEditorWidget::initializeSearchBarAndCompleter()
         }
     });
 
-    searchLayout->addWidget(searchBar);
-
     setFocusProxy(searchBar);
     setFocusPolicy(Qt::ClickFocus);
 
@@ -143,16 +133,13 @@ void VisualDeckEditorWidget::initializeSearchBarAndCompleter()
     });
 
     // Search button functionality
-    searchPushButton = new CompactPushButton(searchContainer);
-    searchPushButton->setButtonIcon(QPixmap("theme:icons/search"));
+    searchPushButton = new QPushButton(this);
     connect(searchPushButton, &QPushButton::clicked, this, [=, this]() {
         ExactCard card = CardDatabaseManager::query()->getCard({searchBar->text()});
         if (card) {
             emit cardAdditionRequested(card);
         }
     });
-
-    searchLayout->addWidget(searchPushButton);
 }
 
 void VisualDeckEditorWidget::initializeDisplayOptionsWidget()
@@ -169,14 +156,18 @@ void VisualDeckEditorWidget::initializeDisplayOptionsWidget()
 void VisualDeckEditorWidget::initializeDisplayOptionsAndSearchWidget()
 {
     initializeSearchBarAndCompleter();
+
     initializeDisplayOptionsWidget();
 
-    displayOptionsAndSearch = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
+    displayOptionsAndSearch = new QWidget(this);
+    displayOptionsAndSearchLayout = new QHBoxLayout(displayOptionsAndSearch);
+    displayOptionsAndSearchLayout->setContentsMargins(0, 0, 0, 0);
+    displayOptionsAndSearchLayout->setAlignment(Qt::AlignLeft);
+    displayOptionsAndSearch->setLayout(displayOptionsAndSearchLayout);
 
-    // 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
+    displayOptionsAndSearchLayout->addWidget(displayOptionsWidget);
+    displayOptionsAndSearchLayout->addWidget(searchBar);
+    displayOptionsAndSearchLayout->addWidget(searchPushButton);
 }
 
 void VisualDeckEditorWidget::initializeScrollAreaAndZoneContainer()
@@ -214,7 +205,7 @@ void VisualDeckEditorWidget::connectDeckListModel()
 void VisualDeckEditorWidget::retranslateUi()
 {
     searchBar->setPlaceholderText(tr("Type a card name here for suggestions from the database..."));
-    searchPushButton->setButtonText(tr("Quick search and add card"));
+    searchPushButton->setText(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"));
 
@@ -223,44 +214,6 @@ void VisualDeckEditorWidget::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) {
@@ -281,7 +234,7 @@ void VisualDeckEditorWidget::constructZoneWidgetForIndex(QPersistentModelIndex p
         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::cardClicked, this, &VisualDeckEditorWidget::onCardClick);
     connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this,
             &VisualDeckEditorWidget::cleanupInvalidZones);
     connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget,
@@ -401,6 +354,13 @@ void VisualDeckEditorWidget::decklistDataChanged(QModelIndex topLeft, QModelInde
 //                                                 User Interaction
 // =====================================================================================================================
 
+void VisualDeckEditorWidget::onCardClick(QMouseEvent *event,
+                                         CardInfoPictureWithTextOverlayWidget *instance,
+                                         QString zoneName)
+{
+    emit cardClicked(event, instance, zoneName);
+}
+
 void VisualDeckEditorWidget::onHover(const ExactCard &hoveredCard)
 {
     // If user has any card selected, ignore hover
@@ -411,7 +371,7 @@ void VisualDeckEditorWidget::onHover(const ExactCard &hoveredCard)
     // If nothing is selected -> this is our "active/preview" card
     emit activeCardChanged(hoveredCard);
 
-    //! \todo Highlight hovered card visually.
+    // TODO: highlight hovered card visually:
     // highlightHoveredCard(hoveredCard);
 }
 
@@ -422,7 +382,7 @@ void VisualDeckEditorWidget::setSelectionModel(QItemSelectionModel *model)
     }
 
     if (selectionModel) {
-        //! \todo Possibly disconnect old signal connections.
+        // TODO: Possibly disconnect old ones?
     }
 
     selectionModel = model;
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 da02b5c1f..13065d623 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,8 +1,8 @@
 /**
  * @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
@@ -11,7 +11,6 @@
 #include "../cards/card_size_widget.h"
 #include "../general/layout_containers/overlap_control_widget.h"
 #include "../quick_settings/settings_button_widget.h"
-#include "../utility/compact_push_button.h"
 #include "visual_deck_editor_placeholder_widget.h"
 
 #include <QCheckBox>
@@ -40,7 +39,6 @@ class VisualDeckEditorWidget : public QWidget
 public:
     explicit VisualDeckEditorWidget(QWidget *parent, DeckListModel *deckListModel, QItemSelectionModel *selectionModel);
     void retranslateUi();
-    void updateCompactMode();
     void clearAllDisplayWidgets();
 
     void setDeckList(const DeckList &_deckListModel);
@@ -69,7 +67,7 @@ signals:
     void activeCardChanged(const ExactCard &activeCard);
     void activeGroupCriteriaChanged(QString activeGroupCriteria);
     void activeSortCriteriaChanged(QStringList activeSortCriteria);
-    void cardClicked(QMouseEvent *event, const ExactCard &card, const QString &zoneName);
+    void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
     void cardAdditionRequested(const ExactCard &card);
     void displayTypeChanged(DisplayType displayType);
 
@@ -82,24 +80,21 @@ protected:
 
 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;
-    FlowWidget *displayOptionsAndSearch;
+    QWidget *displayOptionsAndSearch;
+    QHBoxLayout *displayOptionsAndSearchLayout;
     VisualDeckDisplayOptionsWidget *displayOptionsWidget;
-    CompactPushButton *searchPushButton;
+    QPushButton *searchPushButton;
     QScrollArea *scrollArea;
     QWidget *zoneContainer;
     QVBoxLayout *zoneContainerLayout;
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 0207e2ee2..551dbb35c 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,8 +1,8 @@
 /**
  * @file deck_preview_color_identity_filter_widget.h
  * @ingroup VisualDeckPreviewWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DECK_PREVIEW_COLOR_IDENTITY_FILTER_WIDGET_H
 #define 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.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h
index 4bd7915cd..bfd0a170d 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,8 +1,8 @@
 /**
  * @file deck_preview_deck_tags_display_widget.h
  * @ingroup VisualDeckPreviewWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
 #define DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
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 7a3a735a2..c0fa86d19 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,8 +1,8 @@
 /**
  * @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
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 4d9040af4..59b330a65 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,8 +2,8 @@
  * @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
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 980741c5d..a868aa4f1 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,8 +1,8 @@
 /**
  * @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
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 a3301799a..5caae90a1 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,8 +1,8 @@
 /**
  * @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
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 06dc9dd84..77ea8f865 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
@@ -28,8 +28,8 @@ DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
 
     deckLoader = new DeckLoader(this);
     connect(deckLoader, &DeckLoader::loadFinished, this, &DeckPreviewWidget::initializeUi);
-    //! \todo Batch tag refresh: count finished deck loads and refresh tags once all decks are loaded.
-    // Currently expensive: refreshes on each individual deck load instead of once at the end.
+    /* 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, DeckFileFormat::getFormatFromName(filePath), false);
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 0ed64e9e2..98116cabe 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,8 +1,8 @@
 /**
  * @file deck_preview_widget.h
  * @ingroup VisualDeckPreviewWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DECK_PREVIEW_WIDGET_H
 #define DECK_PREVIEW_WIDGET_H
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 a5e3be212..d76fb0497 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,8 +1,8 @@
 /**
  * @file visual_deck_storage_folder_display_widget.h
  * @ingroup VisualDeckStorageWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef VISUAL_DECK_STORAGE_FOLDER_DISPLAY_WIDGET_H
 #define VISUAL_DECK_STORAGE_FOLDER_DISPLAY_WIDGET_H
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 2f3d81aeb..67d260b21 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,8 +1,8 @@
 /**
  * @file visual_deck_storage_search_widget.h
  * @ingroup VisualDeckStorageWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef VISUAL_DECK_STORAGE_SEARCH_WIDGET_H
 #define VISUAL_DECK_STORAGE_SEARCH_WIDGET_H
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 24eddba33..1ea06aba4 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,8 +1,8 @@
 /**
  * @file visual_deck_storage_sort_widget.h
  * @ingroup VisualDeckStorageWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef VISUAL_DECK_STORAGE_SORT_WIDGET_H
 #define VISUAL_DECK_STORAGE_SORT_WIDGET_H
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 c4c8d18a8..28fd7a5ca 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
@@ -126,9 +126,8 @@ void VisualDeckStorageTagFilterWidget::addTagIfNotPresent(const QString &tag)
 void VisualDeckStorageTagFilterWidget::sortTags()
 {
     auto *flowWidget = findChild<FlowWidget *>();
-    if (!flowWidget) {
+    if (!flowWidget)
         return;
-    }
 
     // Get all tag widgets
     QList<DeckPreviewTagDisplayWidget *> tagWidgets = findChildren<DeckPreviewTagDisplayWidget *>();
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 3290c9e9a..ada94a244 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,8 +1,8 @@
 /**
  * @file visual_deck_storage_tag_filter_widget.h
  * @ingroup VisualDeckStorageWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H
 #define VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H
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 c3c0ae91b..b13c51700 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,8 +1,8 @@
 /**
  * @file visual_deck_storage_widget.h
  * @ingroup VisualDeckStorageWidgets
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef VISUAL_DECK_STORAGE_WIDGET_H
 #define VISUAL_DECK_STORAGE_WIDGET_H
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index 69d3260bc..fbba6c3f5 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -22,9 +22,14 @@
 #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 "../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"
@@ -35,8 +40,6 @@
 #include "../main.h"
 #include "logger.h"
 #include "version_string.h"
-#include "widgets/dialogs/dlg_connect.h"
-#include "widgets/server/handle_public_servers.h"
 #include "widgets/utility/get_text_with_max.h"
 
 #include <QAction>
@@ -64,6 +67,8 @@
 #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>
 
@@ -79,7 +84,6 @@
 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.
@@ -88,18 +92,66 @@ inline Q_LOGGING_CATEGORY(MainWindowLog, "main_window");
  */
 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) {
+    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);
 }
 
 void MainWindow::statusChanged(ClientStatus _status)
 {
-    connectionController->refreshWindowTitle();
+    setClientStatusTitle();
     switch (_status) {
         case StatusDisconnected:
             tabSupervisor->stop();
@@ -124,16 +176,51 @@ 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()
 {
-    connectionController->connectToServer();
+    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());
+    }
 }
 
 void MainWindow::actDisconnect()
 {
-    connectionController->disconnectFromServer();
+    client->disconnectFromServer();
 }
 
 void MainWindow::actSinglePlayer()
@@ -179,24 +266,20 @@ void MainWindow::actWatchReplay()
     QFileDialog dlg(this, tr("Load replay"));
     dlg.setDirectory(SettingsCache::instance().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;
-    if (replay->ParseFromArray(buf.data(), buf.size())) {
-        tabSupervisor->openReplay(replay);
-    } else {
-        qCWarning(MainWindowLog) << "failed to parse replay!";
-    }
+    replay->ParseFromArray(buf.data(), buf.size());
+
+    tabSupervisor->openReplay(replay);
 }
 
 void MainWindow::localGameEnded()
@@ -212,11 +295,10 @@ 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()
@@ -288,9 +370,292 @@ 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");
+                    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;
+}
+
+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()
 {
-    connectionController->refreshWindowTitle();
+    setClientStatusTitle();
 
     aConnect->setText(tr("&Connect..."));
     aDisconnect->setText(tr("&Disconnect"));
@@ -349,9 +714,9 @@ void MainWindow::createActions()
     aFullScreen->setCheckable(true);
     connect(aFullScreen, &QAction::toggled, this, &MainWindow::actFullScreen);
     aRegister = new QAction(this);
-    connect(aRegister, &QAction::triggered, connectionController, &ConnectionController::registerToServer);
+    connect(aRegister, &QAction::triggered, this, &MainWindow::actRegister);
     aForgotPassword = new QAction(this);
-    connect(aForgotPassword, &QAction::triggered, connectionController, &ConnectionController::forgotPasswordRequest);
+    connect(aForgotPassword, &QAction::triggered, this, &MainWindow::actForgotPasswordRequest);
     aSettings = new QAction(this);
     connect(aSettings, &QAction::triggered, this, &MainWindow::actSettings);
     aExit = new QAction(this);
@@ -476,22 +841,38 @@ MainWindow::MainWindow(QWidget *parent)
             &MainWindow::pixmapCacheSizeChanged);
     pixmapCacheSizeChanged(SettingsCache::instance().getPixmapCacheSize());
 
-    connectionController = new ConnectionController(this, this);
+    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();
 
     createActions();
     createMenus();
 
-    connect(connectionController, &ConnectionController::windowTitleChanged, this, &MainWindow::setWindowTitle);
-    connect(connectionController, &ConnectionController::statusChanged, this, &MainWindow::statusChanged);
-
-    tabSupervisor = new TabSupervisor(connectionController->client(), tabsMenu, this);
+    tabSupervisor = new TabSupervisor(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(connectionController, &ConnectionController::tabSupervisorStartRequested, tabSupervisor,
-            &TabSupervisor::start);
-    connect(connectionController, &ConnectionController::tabSupervisorStopRequested, tabSupervisor,
-            &TabSupervisor::stop);
     tabSupervisor->initStartupTabs();
 
     setCentralWidget(tabSupervisor);
@@ -659,6 +1040,9 @@ MainWindow::~MainWindow()
         cardUpdateProcess->waitForFinished(1000);
         cardUpdateProcess = nullptr;
     }
+
+    client->deleteLater();
+    clientThread->wait();
 }
 
 void MainWindow::createTrayIcon()
@@ -692,13 +1076,20 @@ 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 (!tabSupervisor->close()) {
@@ -715,21 +1106,20 @@ void MainWindow::closeEvent(QCloseEvent *event)
 
 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;
-                connectionController->connectToServerDirect(connectTo.host(), connectTo.port(), connectTo.userName(),
-                                                            connectTo.password());
+                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);
-                connectionController->connectToServerDirect(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
-                                                            dlg.getPlayerName(), dlg.getPassword());
+                client->connectToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()), dlg.getPlayerName(),
+                                        dlg.getPassword());
             }
         }
     }
@@ -780,13 +1170,6 @@ void MainWindow::cardDatabaseLoadingFailed()
 
 void MainWindow::cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknownSetsNames)
 {
-    if (SettingsCache::instance().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);
@@ -797,7 +1180,6 @@ 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);
@@ -806,13 +1188,7 @@ void MainWindow::cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknow
 
     if (msgBox.clickedButton() == yesButton) {
         CardDatabaseManager::getInstance()->enableAllUnknownSets();
-        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().setAlwaysEnableNewSets(true);
+        const auto reloadOk1 = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
     } else if (msgBox.clickedButton() == noButton) {
         CardDatabaseManager::getInstance()->markAllSetsAsKnown();
     } else if (msgBox.clickedButton() == settingsButton) {
@@ -1002,6 +1378,15 @@ 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();
@@ -1075,9 +1460,8 @@ 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;
@@ -1086,7 +1470,7 @@ int MainWindow::getNextCustomSetPrefix(QDir dataDir)
 void MainWindow::actReloadCardDatabase()
 {
     const auto reloadOk1 = QtConcurrent::run([] {
-        CardDatabaseManager::getInstance()->reloadCardDatabasesAndNotify();
+        CardDatabaseManager::getInstance()->loadCardDatabases();
         SettingsCache::instance().downloads().sync();
     });
 }
@@ -1103,3 +1487,42 @@ 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 5f631ddc3..ed6de5b0d 100644
--- a/cockatrice/src/interface/window_main.h
+++ b/cockatrice/src/interface/window_main.h
@@ -20,12 +20,11 @@
 /**
  * @file window_main.h
  * @ingroup Core
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "connection_controller/remote_connection_controller.h"
 #include "widgets/dialogs/dlg_local_game_options.h"
 
 #include <QList>
@@ -69,19 +68,38 @@ public slots:
 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 cardUpdateError(QProcess::ProcessError err);
@@ -107,6 +125,7 @@ private slots:
 private:
     static const QString appName;
     static const QStringList fileNameFilters;
+    void setClientStatusTitle();
     void retranslateUi();
     void createActions();
     void createMenus();
@@ -133,11 +152,14 @@ private:
 
     TabSupervisor *tabSupervisor;
     WndSets *wndSets;
-    ConnectionController *connectionController;
+    RemoteClient *client;
+    QThread *clientThread;
     LocalServer *localServer;
     bool bHasActivated, askedForDbUpdater;
+    QMessageBox serverShutdownMessageBox;
     QProcess *cardUpdateProcess;
     DlgViewLog *logviewDialog;
+    DlgConnect *dlgConnect;
     GameReplay *replay;
     DlgTipOfTheDay *tip;
     QUrl connectTo;
@@ -158,6 +180,7 @@ public:
 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 ad68d4be9..7092a3fd7 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -158,11 +158,9 @@ 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;
diff --git a/cockatrice/src/main.h b/cockatrice/src/main.h
index ef75a41f4..b6e086744 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
diff --git a/cockatrice/themes/CMakeLists.txt b/cockatrice/themes/CMakeLists.txt
index 577977551..3e07c54dd 100644
--- a/cockatrice/themes/CMakeLists.txt
+++ b/cockatrice/themes/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # add themes subfolders
 
-set(defthemes Default Fabric Fusion Leather Plasma VelvetMarble)
+set(defthemes Fabric Leather Plasma VelvetMarble)
 
 if(UNIX)
   if(APPLE)
diff --git a/cockatrice/themes/Default/palette-default-dark.toml b/cockatrice/themes/Default/palette-default-dark.toml
deleted file mode 100644
index 3ee174a2f..000000000
--- a/cockatrice/themes/Default/palette-default-dark.toml
+++ /dev/null
@@ -1,63 +0,0 @@
-[Palette]
-WindowText           = #ffffffff
-Button               = #ff383838
-Light                = #ff737373
-Midlight             = #ff525252
-Dark                 = #ff161616
-Mid                  = #ff252525
-Text                 = #ffffffff
-BrightText           = #ffb4dd8b
-ButtonText           = #ffffffff
-Base                 = #ff2b2b2b
-Window               = #ff1c1c1c
-Shadow               = #ff000000
-HighlightedText      = #ff000000
-Link                 = #ffcde4b6
-LinkVisited          = #ff99d999
-AlternateBase        = #ff242424
-ToolTipBase          = #ffffffdc
-ToolTipText          = #ff000000
-PlaceholderText      = #6effffff
-
-[Palette.Disabled]
-WindowText           = #ff9d9d9d
-Button               = #ff1c1c1c
-Light                = #ff737373
-Midlight             = #ff525252
-Dark                 = #ff161616
-Mid                  = #ff252525
-Text                 = #ff9d9d9d
-BrightText           = #ffb4dd8b
-ButtonText           = #ff787878
-Base                 = #ff1c1c1c
-Window               = #ff1c1c1c
-Shadow               = #ff000000
-HighlightedText      = #ff9d9d9d
-Link                 = #ff308cc6
-LinkVisited          = #ffb450ff
-AlternateBase        = #ff242424
-ToolTipBase          = #ffffffdc
-ToolTipText          = #ff000000
-PlaceholderText      = #46ffffff
-
-[Palette.Inactive]
-WindowText           = #ffffffff
-Button               = #ff383838
-Light                = #ff737373
-Midlight             = #ff525252
-Dark                 = #ff161616
-Mid                  = #ff252525
-Text                 = #ffffffff
-BrightText           = #ffb4dd8b
-ButtonText           = #ffffffff
-Base                 = #ff2b2b2b
-Window               = #ff1c1c1c
-Shadow               = #ff000000
-HighlightedText      = #ffffffff
-Link                 = #ffcde4b6
-LinkVisited          = #ff99d999
-AlternateBase        = #ff242424
-ToolTipBase          = #ffffffdc
-ToolTipText          = #ff000000
-PlaceholderText      = #6effffff
-
diff --git a/cockatrice/themes/Default/theme.cfg b/cockatrice/themes/Default/theme.cfg
deleted file mode 100644
index d2016a238..000000000
--- a/cockatrice/themes/Default/theme.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[Appearance]
-ColorScheme = Light
-
-[Style]
-Name = Default
diff --git a/cockatrice/themes/Fusion/palette-default-dark.toml b/cockatrice/themes/Fusion/palette-default-dark.toml
deleted file mode 100644
index c1d83a4cd..000000000
--- a/cockatrice/themes/Fusion/palette-default-dark.toml
+++ /dev/null
@@ -1,69 +0,0 @@
-[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            = #ff148c3c
-HighlightedText      = #ffffffff
-Link                 = #ff00f652
-LinkVisited          = #ff00d346
-AlternateBase        = #ff353535
-ToolTipBase          = #ff3c3c3c
-ToolTipText          = #ffd4d4d4
-PlaceholderText      = #80ffffff
-Accent               = #ff00d346
-
-[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            = #ff148c3c
-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                 = #ff00f652
-LinkVisited          = #ff00d346
-AlternateBase        = #ff353535
-ToolTipBase          = #ff3c3c3c
-ToolTipText          = #ffd4d4d4
-PlaceholderText      = #80ffffff
-Accent               = #ff1e1e1e
-
diff --git a/cockatrice/themes/Fusion/palette-default-light.toml b/cockatrice/themes/Fusion/palette-default-light.toml
deleted file mode 100644
index 86c41be78..000000000
--- a/cockatrice/themes/Fusion/palette-default-light.toml
+++ /dev/null
@@ -1,69 +0,0 @@
-[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            = #ff148c3c
-HighlightedText      = #ffffffff
-Link                 = #ff0d5f28
-LinkVisited          = #ff08401b
-AlternateBase        = #ffe9e7e3
-ToolTipBase          = #ffffffdc
-ToolTipText          = #ff000000
-PlaceholderText      = #80000000
-Accent               = #ff107532
-
-[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            = #ff148c3c
-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                 = #ff0d5f28
-LinkVisited          = #ff08401b
-AlternateBase        = #ffe9e7e3
-ToolTipBase          = #ffffffdc
-ToolTipText          = #ff000000
-PlaceholderText      = #80000000
-Accent               = #fff0f0f0
-
diff --git a/cockatrice/themes/Fusion/theme.cfg b/cockatrice/themes/Fusion/theme.cfg
deleted file mode 100644
index 9b38e505e..000000000
--- a/cockatrice/themes/Fusion/theme.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[Appearance]
-ColorScheme = Dark
-
-[Style]
-Name = Fusion
diff --git a/cockatrice/translations/cockatrice_cs.ts b/cockatrice/translations/cockatrice_cs.ts
index c210315c7..c13bfb2df 100644
--- a/cockatrice/translations/cockatrice_cs.ts
+++ b/cockatrice/translations/cockatrice_cs.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,60 +36,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Nastavení vzhledu</translation>
     </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>Current theme:</source>
         <translation>Aktuální vzhled</translation>
     </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>Open themes folder</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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Vykreslování karet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>Rozvržení ruky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>Zapnout </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Rozložení herní mřížky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <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="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximální velikost písma pro informace na kartách</translation>
     </message>
@@ -300,12 +322,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +642,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -676,124 +693,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</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="439"/>
         <source>&amp;Select All</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="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -809,133 +826,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -997,7 +1014,7 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1028,32 +1045,32 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,17 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Aktualizovat spoilery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Úspěch</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <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="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Aktualizuji...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Vyberte cestu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>Spoilery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>Stahovat spoilery automaticky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Poslední změna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <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="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>Smazat stáhnuté obrázky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1467,32 +1484,32 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Počet</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Karta</translation>
     </message>
@@ -1528,12 +1545,12 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1750,32 +1767,32 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2868,17 +2885,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Neplatný formát balíčku.</translation>
     </message>
@@ -2886,43 +2903,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2941,73 +2958,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3168,12 +3152,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3190,7 +3174,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3207,7 +3191,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3216,7 +3200,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3225,7 +3209,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3234,7 +3218,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3243,59 +3227,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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Vzhled</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Rozhraní</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Zvuk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Skratky</translation>
     </message>
@@ -3608,67 +3592,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4116,143 +4100,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Vyberte cestu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Osobní nastavení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Jazyk:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>Cesty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4260,47 +4244,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4308,88 +4292,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4397,52 +4381,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4450,213 +4434,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4748,8 +4712,18 @@ Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Počet hráčů</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <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="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Hráč %1</translation>
     </message>
@@ -4852,8 +4826,8 @@ Will now login.</source>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
@@ -5257,144 +5231,144 @@ Lokální verze je %1, verze serveru je %2.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <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="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5402,54 +5376,54 @@ 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="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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
@@ -5500,7 +5474,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5654,233 +5628,223 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation> z exilnutých karet</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</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="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s 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="83"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation> ze sideboardu</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation> ze stacku</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</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="153"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>kartu</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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="317"/>
-        <source>%1 exiles %2%3 face down.</source>
+        <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -5889,375 +5853,365 @@ Cockatrice will now reload the card database.</source>
         <translation>%1 exiluje %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <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="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>Hra začíná.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <source>%1 has left the game (%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="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <source>%1 reveals %2%3 to %4.</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="557"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</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="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</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="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -6265,110 +6219,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Přidat zprávu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Zpráva:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
@@ -6381,37 +6335,32 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6553,57 +6502,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Odtapovací fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Lízací fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>První hlavní fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Začátek bojové fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Oznámení útočníků</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Oznámení blokujících</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Udělení bojového zranění</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Konec bojové fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>Druhá hlavní fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Konec kola</translation>
     </message>
@@ -6620,138 +6569,134 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6759,65 +6704,48 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6866,25 +6794,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7023,33 +6943,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7198,37 +7091,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7271,14 +7164,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>Hry</translation>
     </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>
@@ -7343,53 +7228,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7456,27 +7341,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -7692,123 +7577,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7816,52 +7637,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7869,55 +7698,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7982,7 +7817,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>Nová složka</translation>
     </message>
@@ -8064,18 +7899,18 @@ Prosím vložte jméno:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Název nové složky:</translation>
     </message>
@@ -8093,12 +7928,12 @@ Prosím vložte jméno:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8147,191 +7982,197 @@ Prosím vložte jméno:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</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="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>&amp;Fáze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>&amp;Hra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Další &amp;fáze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</source>
         <translation>Další &amp;kolo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>Reverse turn order</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="303"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <source>Rotate View Cl&amp;ockwise</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="309"/>
         <source>Rotate View Co&amp;unterclockwise</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="312"/>
         <source>Game &amp;information</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="315"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Ukončit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Opustit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;Chat:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Ukončit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Opustit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the 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="641"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
@@ -9425,152 +9266,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Animace</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Animace tapnutí/odtapnutí</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9634,24 +9465,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9678,108 +9508,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9787,32 +9534,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9848,7 +9585,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9856,19 +9593,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9876,37 +9613,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9920,22 +9647,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9943,64 +9700,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10008,17 +9757,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10034,52 +9783,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10180,133 +9924,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <source>Move selected set to the top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <source>Move selected set to the bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</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="135"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10314,72 +10058,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</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="229"/>
         <source>Group by Type</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="230"/>
         <source>Group by Mana Value</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="231"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</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="239"/>
         <source>Sort by Name</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="240"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>zamíchat po zavření</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -10414,7 +10158,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -10495,7 +10239,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -10647,7 +10391,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
@@ -11068,8 +10812,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -11089,102 +10832,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <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="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Exil</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Hřbitov</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Ruka</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</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="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
@@ -11220,246 +10959,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Vzdát hru</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts
index 564f39e25..ed1a88be8 100644
--- a/cockatrice/translations/cockatrice_de.ts
+++ b/cockatrice/translations/cockatrice_de.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation>&amp;aktualisieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Setnamen und -Nummer parsen (falls verfügbar)</translation>
     </message>
@@ -36,62 +36,62 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <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="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation>Sind Sie sicher?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation>Deck speichern</translation>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation>Es gibt keine Karten in Ihrem Deck zum Exportieren</translation>
     </message>
@@ -133,168 +133,202 @@ Bitte überprüfen Sie, ob das Verzeichnis bearbeitet werden kann und versuchen
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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 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/dlg_settings.cpp" line="672"/>
+        <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 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/dlg_settings.cpp" line="681"/>
+        <source>Confirm Change</source>
+        <translation>Änderung bestätigen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Darstellungseinstellungen</translation>
     </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>Current theme:</source>
         <translation>Aktuelles Theme:</translation>
     </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>Open themes folder</source>
         <translation>Öffne Themeverzeichnis</translation>
     </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>Home tab background source:</source>
         <translation>Startseitenhintergrund-Quelle:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation>Startseitenhintergrund Wechselfrequenz:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation>Deaktiviert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <source>Display card name of background in bottom right:</source>
-        <translation>Kartenname des Hintergrunds unten rechts anzeigen:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation>Einstellungsmenü</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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="734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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/dialogs/dlg_settings.cpp" line="736"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Kartendarstellung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <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="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <source>Use rounded card corners</source>
         <translation>Abgerundete Kartenecken verwenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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="748"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation>Reihen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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="752"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation>Kartenzähler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</source>
         <translation>Zähler %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
         <source>Hand layout</source>
         <translation>Handdarstellung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>Linksbündige Ausrichtung aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Spielfeldraster</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Vertikale Koordinate umkehren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximale Schriftgröße für die Anzeige von Informationen auf Karten:</translation>
     </message>
@@ -302,12 +336,7 @@ Bitte überprüfen Sie, ob das Verzeichnis bearbeitet werden kann und versuchen
 <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>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="93"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation>Deck im Deck-Editor öffnen</translation>
     </message>
@@ -627,22 +656,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <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="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <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="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -678,124 +707,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation>Zeigen an....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation>&amp;Alle Spieler</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation>Verwandte Karten ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation>Spielstein:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</source>
         <translation>Alle Spielsteine</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="439"/>
         <source>&amp;Select All</source>
         <translation>&amp;Alles auswählen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="440"/>
         <source>S&amp;elect Row</source>
         <translation>Reihe auswählen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation>Spalte auswählen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation>&amp;Spielen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation>&amp;Verstecken</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation>Verdeckt ausspielen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
-        <translation>Enttappen überspringen</translation>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Normales Enttapen umschalten</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation>%Kartenvorderseite ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <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="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation>Lösen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation>&amp;Pfeil zeichnen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation>&amp;Anmerkung setzen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation>Kartenzähler</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <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="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <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="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>&amp;Zähler setzen (%1)...</translation>
     </message>
@@ -811,133 +840,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>ihrer Hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <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="187"/>
+        <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="189"/>
         <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="190"/>
-        <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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation>ihrer Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>ihrer Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>ihres Friedhofs</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>ihres Exils</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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="203"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</comment>
+        <translation>ihres Nebendecks</translation>
+    </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>%1&apos;s Nebendeck</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
-        <source>their sideboard</source>
-        <comment>nominative</comment>
-        <translation>ihres Nebendecks</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
-        <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="212"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>%1&apos;s individuelle Zone &apos;%2&apos;</translation>
@@ -999,7 +1028,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation>Kartendatenbank</translation>
     </message>
@@ -1007,7 +1036,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Karteninformation</translation>
     </message>
@@ -1030,32 +1059,32 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
         <translation>Zum Sideboard hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <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="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <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="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Karte zum &amp;Sideboard hinzufügen</translation>
     </message>
@@ -1063,32 +1092,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation>Bannerkarte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation>Haupttyp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation>Manakosten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation>Auswahl der Auflage</translation>
     </message>
@@ -1161,17 +1190,17 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation>Filter</translation>
     </message>
     <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="140"/>
         <source>&amp;Clear all filters</source>
         <translation>&amp;Alle Filter entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation>Auswahl löschen</translation>
     </message>
@@ -1294,7 +1323,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation>Auflagenauswahl</translation>
     </message>
@@ -1302,166 +1331,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Spoiler aktualisieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Erfolgreich</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <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="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <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="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>URL hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>URL bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation>Größe des Netzwerkzwischenspeichers:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation>Umleitungszwischenspeicher TTL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation>Größe des Bilderzwischenspeichers:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>Neue URL hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>URL entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>Tag(e)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Aktualisiere...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Pfad auswählen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>URL Downloadpriorität</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>Spoiler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>Lade Spoiler automatisch herunter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Letzte Änderung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <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="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <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="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <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="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>Heruntergeladene Bilder löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>Download-URLs zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation>Festplatten-Cache für heruntergeladene Bilder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>Arbeitsspeicher-Cache für Bilder die gerade nicht angezeigt werden</translation>
     </message>
@@ -1469,32 +1498,32 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation>Rückgängig machen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation>[wiederholen] </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation>[rückgängig machen] </translation>
     </message>
@@ -1502,27 +1531,27 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation>Anzahl</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation>Festlegen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation>ID des Anbieters</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Karte</translation>
     </message>
@@ -1530,12 +1559,12 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation>Standarddeckformate (%1)</translation>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation>Alle Dateien (*.*)</translation>
     </message>
@@ -1632,94 +1661,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation>Bannerkarte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <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="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <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="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation>Kommentiert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <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="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <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="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <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="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <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="488"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <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="415"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation>Löschen fehlgeschlagen</translation>
     </message>
@@ -1752,32 +1781,32 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
         <translation>Format setzen zu %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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="257"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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="275"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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="299"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation>Hinzugefügt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation>Entfernt</translation>
     </message>
@@ -1844,30 +1873,30 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
         <translation>Sideboard gesperrt</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <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="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -2362,17 +2391,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <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="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation>Ungültige Deckliste.</translation>
     </message>
@@ -2873,17 +2902,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Ungültige Deckliste.</translation>
     </message>
@@ -2891,45 +2920,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <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="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation>Netzwerkfehler: %1</translation>
     </message>
     <message>
-        <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="94"/>
         <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="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2954,73 +2983,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
         <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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <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="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation>Anzahl der Treffer:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <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="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation>Basilisk</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>Ungültiger Filter</translation>
     </message>
@@ -3182,12 +3178,12 @@ Die E-Mail-Adresse wird zur Accountverifikation genutzt.</translation>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3204,7 +3200,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3221,7 +3217,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3234,7 +3230,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3243,7 +3239,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3252,7 +3248,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3265,59 +3261,59 @@ 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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Allgemeines</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Erscheinungsbild</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Benutzeroberfläche</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>Kartenquellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Töne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Tastaturkürzel</translation>
     </message>
@@ -3634,67 +3630,67 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation>Wahrscheinlichkeit (%)</translation>
     </message>
@@ -4142,143 +4138,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Pfad auswählen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Persönliche Einstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Sprache:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>Pfade</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation>Tage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation>Letzte Aktualisierungsprüfung am %1 (vor %2 Tagen)</translation>
     </message>
@@ -4286,47 +4282,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/player/menu/grave_menu.cpp" line="97"/>
         <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/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <source>&amp;All players</source>
         <translation>&amp;Alle Spieler</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
         <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/player/menu/grave_menu.cpp" line="106"/>
         <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/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation>Zufällige Karte vorzeigen für ...</translation>
     </message>
@@ -4334,88 +4330,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation>&amp;Hand ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation>Hand nach ... sortieren</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation>Manawert</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation>&amp;Mulligan nehmen (Handgröße wählen)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation>Mulligan nehmen (Gleiche Handgröße)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation>Mulligan nehmen (Handgröße -1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation>&amp;Hand nach ... bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <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="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <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="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Friedhof</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation>&amp;Hand an ... vorzeigen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation>Alle Spieler</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation>Zufällige Karten an ... vorzeigen</translation>
     </message>
@@ -4423,52 +4419,52 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation>Neues Deck erstellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation>Decks durchsuchen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation>Kartendatenbank durchsuchen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation>EDHRec durchsuchen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation>Archidekt durchsuchen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation>Wiederholung ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation>Verlassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation>Verbinden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation>Verbinden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation>Spielen</translation>
     </message>
@@ -4476,213 +4472,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</source>
         <translation>&amp;Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
         <source>&amp;View library</source>
         <translation>&amp;Bibliothek ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <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="213"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
         <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="214"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
         <source>Reveal &amp;library to...</source>
         <translation>Bibliothek an ... vorzeigen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
         <source>Lend library to...</source>
         <translation>Bibliothek ... leihen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
         <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="217"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
         <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="218"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
         <source>&amp;Bottom of library...</source>
         <translation>&amp;Unter die Bibliothek...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
         <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="220"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
         <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="221"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
         <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="223"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
         <source>&amp;Draw card</source>
         <translation>&amp;Karte ziehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
         <source>D&amp;raw cards...</source>
         <translation>Karten ziehen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
         <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="227"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
         <source>Shuffle</source>
         <translation>Mischen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
         <source>&amp;Play top card</source>
         <translation>&amp;Oberste Karte spielen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
         <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="231"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
         <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="232"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
         <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="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <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="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <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="235"/>
-        <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/player/menu/library_menu.cpp" line="236"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <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="237"/>
-        <source>Move top cards to exile face down...</source>
-        <translation>Die obersten Karten verdeckt ins Exil bewegen...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="238"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <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="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation>Oberste Karten mischeln...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation>&amp;Unterste Karte ziehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation>Untere Karten ziehen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation>&amp;Unterste Karte ausspielen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <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="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <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="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <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="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <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="248"/>
-        <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/player/menu/library_menu.cpp" line="249"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <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="250"/>
-        <source>Move bottom cards to exile face down...</source>
-        <translation>Die untersten Karten verdeckt ins Exil bewegen...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="251"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <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="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation>Unterste Karten mischen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation>&amp;Alle Spieler</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation>Oberste Karten der Bibliothek vorzeigen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Anzahl der Karten: (max. %1)</translation>
     </message>
@@ -4780,8 +4756,18 @@ Will now login.</source>
 Login läuft.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Spieleranzahl</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation>Bitte die Spieleranzahl eingeben:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Spieler %1</translation>
     </message>
@@ -4884,8 +4870,8 @@ Login läuft.</translation>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
@@ -5293,36 +5279,36 @@ Lokale Version ist %1, Serverversion ist %2.</translation>
         <translation>Ein-/Ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>Neue Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice wurde installiert</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>Kartendatenbank</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5331,29 +5317,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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Einstellungen öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>Neue Editionen gefunden</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5364,17 +5350,17 @@ Setcode(s): %1
 Möchten Sie es/sie aktivieren?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>Editionen ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Willkommen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5383,65 +5369,65 @@ 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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <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="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <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="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation>Kartendatenbankaktualisierung läuft.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <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="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation>Unbekannter Fehler aufgetreten.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <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="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5452,55 +5438,55 @@ Dies stellt wahrscheinlich kein Problem dar, allerdings könnte dies bedeuten, d
 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="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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Lade Sets/Karten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <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="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <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="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Set-/Kartenimport fehlgeschlagen.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation>Passwort zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <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>
     </message>
@@ -5551,7 +5537,7 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation>Manabasis</translation>
     </message>
@@ -5705,610 +5691,590 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>vom Spielfeld</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation>von ihrem Friedhof</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation> aus dem Exil</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation>von ihrer Hand</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <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="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <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="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <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="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <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="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s library</source>
         <translation>aus %1s Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>von ihrer Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation> aus dem Sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation> vom Stapel</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <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="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <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="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <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="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <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="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <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="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <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="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <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="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <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="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 zerstört %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>eine Karte</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="311"/>
-        <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/log/message_log_widget.cpp" line="313"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="317"/>
-        <source>%1 exiles %2%3 face down.</source>
-        <translation>%1 schickt %2%3 verdeckt ins Exil.</translation>
-    </message>
     <message>
         <location filename="src/game/log/message_log_widget.cpp" line="319"/>
         <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="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%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="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <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="347"/>
-        <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/log/message_log_widget.cpp" line="349"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation>untersten</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation>obersten</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <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="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <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="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <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="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>Das Spiel hat begonnen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <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="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <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="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <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="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <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="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <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="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 zeigt %2 offen vor.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <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="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <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="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>umgekehrt</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>Kopf</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>Zahl</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>%1 ist am Zug.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <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>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <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>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <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="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <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="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <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="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <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="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 tappt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 enttappt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 mischt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 löst %2 ab.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <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="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 legt die zuletzt gezogene Karte zurück (%2)</translation>
     </message>
@@ -6316,110 +6282,110 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>Wort1 Wort2 Wort3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>Neue Nachricht hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>Nachricht bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation>Nachricht entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Nachricht hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Nachricht:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>Nachricht bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>Chat Einstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>Benutzerdefinierte Benachrichtigungswörter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>Chat Erwähnungen aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>Autovervollständigung aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <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="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <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="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>Textfarbe invertieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <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="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <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="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <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="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(Farbcode in hexadezimal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Wörter durch Leerzeichen trennen, nur alphanumerische Zeichen</translation>
     </message>
@@ -6432,37 +6398,32 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
         <translation>Bewegen nach</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <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="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <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="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <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="66"/>
-        <source>T&amp;able</source>
-        <translation>T&amp;isch</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Friedhof</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exil</translation>
     </message>
@@ -6604,57 +6565,57 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Enttappsegment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Versorgungssegment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Ziehsegment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>erste Hauptphase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Anfangssegment der Kampfphase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Angreifer-Deklarieren-Segment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Blocker-Deklarieren-Segment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Kampfschadenssegment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Endsegment der Kampfphase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>zweite Hauptphase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Ende-des-Zuges-Segment</translation>
     </message>
@@ -6671,138 +6632,134 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation>Oberste Karten der Bibliothek ansehen</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Anzahl der Karten: (max. %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation>Unterste Karten der Bibliothek ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation>Oberste Karten der Bibliothek mischen</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation>Unterste Karten der Bibliothek mischen</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation>Hand ziehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation>0 und kleiner sind im Vergleich zur jetzigen Handgröße</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation>Karten ziehen</translation>
     </message>
-    <message>
-        <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>Friedhof</translation>
-    </message>
     <message>
         <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>Exil</translation>
+        <source>Move top cards to grave</source>
+        <translation>Oberste Karten in den Friedhof bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation>Oberste Karten nach %1 bewegen</translation>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
+        <translation>Oberste Karten ins Exil bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation>Unterste Karten nach %1 bewegen</translation>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <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="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <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="786"/>
         <source>Draw bottom cards</source>
         <translation>Unterste Karten ziehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <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="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation>Spielsteine erzeugen</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation>Anzahl:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation>Karte X Karten von oben in der Bibliothek plazieren</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation>In welcher Position sollte diese Karte platziert werden:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation>(max. %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation>Stärke/Widerstandskraft ändern</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation>Ändere Werte auf:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation>Anmerkung setzen</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <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="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation>Zähler setzen</translation>
     </message>
@@ -6810,68 +6767,48 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation>Spieler &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation>&amp;Zähler</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>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>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
+        <translation>S&amp;agen</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <source>Display Navigation Buttons</source>
         <translation>Navigationstasten anzeigen</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="155"/>
-        <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation>Preferenz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation>Version festsetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <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="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation>Zugehörige Karten anzeigen</translation>
     </message>
@@ -6920,25 +6857,17 @@ Diese Einstellung bedeutet, dass sie nur den Standarddruck für jede Karte sehen
         <translation>Erscheinungsdatum</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation>Absteigend</translation>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7077,45 +7006,6 @@ Diese Einstellung bedeutet, dass sie nur den Standarddruck für jede Karte sehen
         <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>
@@ -7264,37 +7154,37 @@ Sind sie sicher, dass diese Funktion deaktiviert werden soll?</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</source>
         <translation>&amp;Exil ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;Move exile to...</source>
         <translation>&amp;Exil nach ... bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
         <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="67"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
         <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="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Friedhof</translation>
     </message>
@@ -7337,14 +7227,6 @@ Sind sie sicher, dass diese Funktion deaktiviert werden soll?</translation>
         <translation>Spiele</translation>
     </message>
 </context>
-<context>
-    <name>SayMenu</name>
-    <message>
-        <location filename="src/game/player/menu/say_menu.cpp" line="16"/>
-        <source>S&amp;ay</source>
-        <translation>S&amp;agen</translation>
-    </message>
-</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -7409,53 +7291,53 @@ Sind sie sicher, dass diese Funktion deaktiviert werden soll?</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <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="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <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="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>Abschnitt:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>Aktion:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>Tastaturkürzel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <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="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation>Alle Tastaturkürzel entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation>Suchen nach Name des Tastenkürzels</translation>
     </message>
@@ -7524,27 +7406,27 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>Töne aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>Aktuelles Ton-Theme:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation>Systemsound testen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>Toneinstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>Masterlautstärke</translation>
     </message>
@@ -7760,123 +7642,59 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <source>Desc.</source>
         <translation>Beschreibung.</translation>
     </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>UND</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="392"/>
-        <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="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation>Deckname...</translation>
-    </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>Besitzer...</translation>
-    </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>Pakete</translation>
-    </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>Erweiterte Filter</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation>Kategorie:</translation>
-    </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>Beliebig</translation>
-    </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>Enthält Karte...</translation>
-    </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>Kommandant...</translation>
-    </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>Etikett...</translation>
-    </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>Deckgröße</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation>Karten:</translation>
-    </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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <source>Asc.</source>
         <translation>Aufsteigend.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation>Sortieren nach:</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
+        <translation>Jede Klammer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation>Filtern nach:</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
+        <translation>Deckname enthält...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation>Anzeigeeinstellungen</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</source>
+        <translation>Besitzername enthält...</translation>
     </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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation>Deaktiviert</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <source>Search</source>
         <translation>Suche</translation>
     </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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation>Formate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation>Min. # an Karten:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation>Seite: </translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation>Archidekt:</translation>
     </message>
@@ -7884,52 +7702,60 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>Karteninformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation>Kartendatenbank</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation>Auflage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>Sichtbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>Schwebend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>Darstellung zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Deck: %1</translation>
     </message>
@@ -7937,55 +7763,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation>Karteninformation</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation>Auflage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation>Sichtbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation>Schwebend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation>Anordnung zurücksetzen</translation>
     </message>
@@ -8050,7 +7882,7 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>Neuer Ordner</translation>
     </message>
@@ -8132,18 +7964,18 @@ Bitte geben Sie einen Namen ein:</translation>
         <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="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Name für den neuen Ordner:</translation>
     </message>
@@ -8161,12 +7993,12 @@ Bitte geben Sie einen Namen ein:</translation>
         <translation>Visuelle Deckablage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation>Deck an Stelle %1 konnte nicht geöffnet werden</translation>
     </message>
@@ -8215,191 +8047,197 @@ Bitte geben Sie einen Namen ein:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>Wiederholung</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>Spiel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>Spielerliste</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>Karteninformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</source>
         <translation>Nachrichten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>Zeitleiste der Aufzeichnung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>&amp;Phasen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>Spi&amp;el</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Nächste &amp;Phase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <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="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>Next &amp;turn</source>
         <translation>Nächster &amp;Zug</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>Reverse turn order</source>
         <translation>Kehre Zugreihenfolge um</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="303"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <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="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="309"/>
         <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="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="312"/>
         <source>Game &amp;information</source>
         <translation>&amp;Spielinformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
         <source>Un&amp;concede</source>
         <translation>Aufgabe zurückziehen</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Aufgeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>Spiel ver&amp;lassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <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="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</source>
         <translation>Chat &amp;fokussieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;Sagen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</source>
         <translation>Ausgewählte Karten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="338"/>
         <source>&amp;View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>Sichtbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>Schwebend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>Darstellung zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Aufgeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>Doch nicht aufgeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Spiel verlassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <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="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <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="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>Sie wurden aus dem Spiel geworfen.</translation>
     </message>
@@ -9502,152 +9340,142 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>Allgemeine Bedienung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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/dialogs/dlg_settings.cpp" line="965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <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="968"/>
-        <source>Show selection counter during drag selection</source>
-        <translation>Auswahlzähler während Zugauswahl anzeigen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
-        <source>Show total selection counter</source>
-        <translation>Gesamtauswahlszähler anzeigen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>Benachrichtigungseinstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <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="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Animationseinstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>Animiertes &amp;Tappen/Enttappen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation>Deckeditor/-ablage Einstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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="979"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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="980"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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="982"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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="984"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation>tue nichts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <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="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation>immer nach .cod konvertieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation>Standarddeckeditortyp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation>Klassischer Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation>Visueller Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation>Wiederholungsoptionen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Pufferzeit für Rückwärtsüberspringen durch Tastenkürzel</translation>
     </message>
@@ -9711,25 +9539,24 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
-        <translation>Enthält</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
+        <translation>Modus: Exakte Übereinstimmung</translation>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
+        <translation>Modus: Enthält</translation>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <source>Mode: Include/Exclude</source>
+        <translation>Modus: Inkludieren/Exkludieren</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation>Filtermodus (UND/ODER/NICHT Verknüpfungen der Filter)</translation>
     </message>
 </context>
 <context>
@@ -9755,108 +9582,25 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
         <translation>Dateinamen eingeben...</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>Sortieren nach</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>Filtern nach</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>Filter speichern und laden</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>Nach exaktem Kartennamen filtern</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>Nach Kartenhaupttyp filtern</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>Nach Kartenuntertyp filtern</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>Nach Set filtern</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>Nach Formatslegalität filtern</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>Speichern/Laden</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation>Name</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>Haupttyp</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>Untertyp</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation>Editionen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <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="71"/>
-        <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="72"/>
-        <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="73"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation>Filtermodus (UND/ODER/NICHT Verbindungen von Filtern)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Exact Match</source>
         <translation>Modus: Exakte Übereinstimmung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation>Modus: Enthält</translation>
     </message>
@@ -9864,32 +9608,22 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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>Haupttypen anzeigen mit mindestens:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
-        <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="68"/>
+        <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>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation>Modus: Enthält</translation>
     </message>
@@ -9925,7 +9659,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation>Filtern nach aktuellsten Sets</translation>
     </message>
@@ -9933,19 +9667,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation>Modus: Enthält</translation>
     </message>
@@ -9953,37 +9687,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="71"/>
-        <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="72"/>
-        <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="73"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation>Modus: Enthält</translation>
     </message>
@@ -9997,22 +9721,52 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation>Visuell</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <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="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <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="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation>Sortieren nach:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation>Filtern nach:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <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_widget.cpp" line="274"/>
+        <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_widget.cpp" line="275"/>
+        <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_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation>Nach Set filtern</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation>Tisch</translation>
     </message>
@@ -10020,64 +9774,56 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation>Gruppieren nach:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <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_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation>Sortieren nach:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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="121"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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="96"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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="118"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation>Probehandgröße</translation>
     </message>
@@ -10085,17 +9831,17 @@ 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="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10111,52 +9857,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation>Dateipfad</translation>
     </message>
@@ -10257,133 +9998,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <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="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation>nach oben verschieben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation>nach unten verschieben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <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="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation>Standardreihenfolge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <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="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>Alle Editionen aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>Alle Editionen deaktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <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="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>Kartenzeichnung</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="135"/>
         <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="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>Tipps</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>Notiz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>Editionen verwalten</translation>
     </message>
@@ -10391,72 +10132,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <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="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</source>
         <translation>Ungruppiert</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Group by Type</source>
         <translation>Gruppieren nach Kartentyp</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <source>Group by Mana Value</source>
         <translation>Gruppieren nach Manabetrag</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Color</source>
         <translation>Gruppieren nach Farbe</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</source>
         <translation>Unsortiert</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Sort by Name</source>
         <translation>Sortieren nach Name</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Type</source>
         <translation>Sortieren nach Kartentyp</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation>Sortieren nach Manakosten</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation>Sortieren nach Farben</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation>Sortieren nach P/T</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation>Sortieren nach Auflage</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>beim Schließen mischen</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>Stapelansicht</translation>
     </message>
@@ -10491,7 +10232,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>Deckeditor</translation>
     </message>
@@ -10572,7 +10313,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation>Wiederholungen</translation>
     </message>
@@ -10724,7 +10465,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>Darstellung zurücksetzen</translation>
     </message>
@@ -11145,9 +10886,8 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation>Enttapen überspringen umschalten</translation>
+        <source>Toggle Untap</source>
+        <translation>Enttappen umschalten</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11166,102 +10906,98 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="516"/>
-        <source>Play Card, Face Down</source>
-        <translation>Karte spielen, verdeckt</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Attach Card...</source>
         <translation>Karte anlegen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>Karte lösen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>Karte klonen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>Spielstein erstellen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>Alle zugehörigen Spielsteine erstellen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>Einen weiter Spielstein erstellen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>Notiz setzen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation>Alle Karten in der Zone auswählen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation>Alle Karten in der Reihe auswählen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation>Alle Karten in der Spalte auswählen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>Untere Karte der Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Exil</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Friedhof</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Hand</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>Obere Karte der Bibliothek</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>Spielfeld, verdeckt</translation>
     </message>
@@ -11297,246 +11033,234 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>Stapel</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation>Friedhof (mehrere)</translation>
     </message>
     <message>
-        <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>Friedhof (mehrere), verdeckt</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="607"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation>Exil (mehrere)</translation>
     </message>
     <message>
-        <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>Exil (mehrere), verdeckt</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation>Stapel bis gefunden</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation>Unterste Karte ziehen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Mehrere Karten von unten ziehen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>Pfeil zeichnen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation>Lokale Pfeile entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>Spiel verlassen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Aufgeben</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>Würfeln...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>Bibliothek mischen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation>Oberste Karten der Bibliothek mischen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation>Unterste Karten der Bibliothek mischen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation>Mulligan nehmen (Gleiche Handgröße)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation>Mulligan nehmen (Handgröße -1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>Eine Karte ziehen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>Mehrere Karten ziehen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>Ziehen rückgängig machen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>Oberste Karte aufgedeckt lassen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>Oberste Karte immer betrachten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation>Hand sortieren nach Name</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation>Hand sortieren nach Typ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation>Hand sortieren nach Manawert</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation>Hand allen Spielern vorzeigen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <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="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>Ansicht im Uhrzeigersinn drehen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Ansicht gegen den Uhrzeigersinn drehen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>Textboxfokus aufheben</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>Chat fokussieren</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>Chat leeren</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>Aktualisieren</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation>Vorspulen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation>Zurückspulen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation>Sehr weit vorspulen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation>Sehr weit zurückspulen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation>Abspielen/Pausieren</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation>Schnelldurchlauf umschalten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation>Zuhause</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation>Visuelle Deckablage</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation>Deckablage</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation>Benutzerkonto</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_el.ts b/cockatrice/translations/cockatrice_el.ts
index 5bd3b2826..dac77fe01 100644
--- a/cockatrice/translations/cockatrice_el.ts
+++ b/cockatrice/translations/cockatrice_el.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,60 +36,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Ρυθμίσεις θέματος</translation>
     </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>Current theme:</source>
         <translation>Τρέχον θέμα:</translation>
     </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>Open themes folder</source>
         <translation>Άνοιγμα φακέλου θεμάτων</translation>
     </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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Απόδοση κάρτας</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <source>Display card names on cards having a picture</source>
         <translation>Εμφανίστε τα ονόματα καρτών σε κάρτες με εικόνα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <source>Scale cards on mouse over</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="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>Διάταξη χειρός</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Εμφάνιση χεριού οριζόντια (σπατάλη χώρου)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>Ενεργοποιήστε την αριστερή αιτιολόγηση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Διάταξη πλέγματος πίνακα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Ανατροπή κάθετης συντεταγμένης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Ελάχιστος αριθμός παικτών για διάταξη πολλαπλών στηλών:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Μέγιστο μέγεθος γραμματοσειράς για πληροφορίες που εμφανίζονται στις κάρτες:</translation>
     </message>
@@ -300,12 +322,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +642,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -676,124 +693,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</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="439"/>
         <source>&amp;Select All</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="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -809,133 +826,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -997,7 +1014,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1028,32 +1045,32 @@ 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/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,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="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Επιτυχία</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</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="1284"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1467,32 +1484,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Αριθμός</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Κάρτα</translation>
     </message>
@@ -1528,12 +1545,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1750,32 +1767,32 @@ 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/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <source>The selected file could not be loaded.</source>
         <translation>Δεν ήταν δυνατή η φόρτωση του επιλεγμένου αρχείου.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2867,17 +2884,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Μη έγκυρο deck list</translation>
     </message>
@@ -2885,43 +2902,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2940,73 +2957,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3167,12 +3151,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <source>Unknown Error loading card database</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="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3183,7 +3167,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3200,7 +3184,7 @@ 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="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3209,21 +3193,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3232,59 +3216,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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</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="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Εμφάνιση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Διεπαφή Χρήστη</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Ήχος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Συντομεύσεις</translation>
     </message>
@@ -3597,67 +3581,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4105,143 +4089,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Επιλέξτε θέση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Γλώσσα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <source>Pictures directory:</source>
         <translation>Φάκελος εικόνων:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
         <source>Card database:</source>
         <translation>Βάση δεδομένων καρτών</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4249,47 +4233,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4297,88 +4281,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4386,52 +4370,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4439,213 +4423,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4736,8 +4700,18 @@ Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation type="unfinished"/>
     </message>
@@ -4840,8 +4814,8 @@ Will now login.</source>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
@@ -5242,144 +5216,144 @@ Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>Βάση δεδομένων καρτών</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Ναι</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>Όχι</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Άνοιγμα ρυθμίσεων</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>Βρέθηκαν νέα σετ</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <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="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>Εμφάνιση σετ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Καλωσήρθατε</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Πληροφορίες</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5387,54 +5361,54 @@ 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="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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Φόρτωση σετ/καρτών</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation>Το επιλεγμένο αρχείο δε βρέθηκε.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
@@ -5485,7 +5459,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5639,233 +5613,223 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>από το παιχνίδι</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation>από την εξορία</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</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="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s library</source>
         <translation>από τη βιβλιοθήκη του/της %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation>από το sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation>από το stack</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</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="153"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <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="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>μία κάρτα</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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="317"/>
-        <source>%1 exiles %2%3 face down.</source>
+        <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -5874,375 +5838,365 @@ Cockatrice will now reload the card database.</source>
         <translation>ο/η %1 εξορίζει το %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <source>The game has been closed.</source>
         <translation>Το παιχνίδι έχει κλείσει</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>Το παιχνίδι ξεκίνησε.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <source>%1 is now watching the game.</source>
         <translation>Ο/Η %1 παρακολουθεί το παιχνίδι.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <source>You have been kicked out of the game.</source>
         <translation>Σας απέβαλαν από το παιχνίδι.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <source>%1 has left the game (%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="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <source>%1 reveals %2%3 to %4.</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="557"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -6250,110 +6204,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</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="1510"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
@@ -6366,37 +6320,32 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6538,57 +6487,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation type="unfinished"/>
     </message>
@@ -6605,138 +6554,134 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6744,65 +6689,48 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6851,25 +6779,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7008,33 +6928,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7183,37 +7076,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7256,14 +7149,6 @@ Are you sure you would like to disable this feature?</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>
@@ -7328,53 +7213,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7441,27 +7326,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -7677,123 +7562,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7801,52 +7622,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7854,55 +7683,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7967,7 +7802,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
@@ -8048,18 +7883,18 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
@@ -8077,12 +7912,12 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8131,191 +7966,197 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</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="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</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="289"/>
         <source>&amp;Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</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="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</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="300"/>
         <source>Reverse turn order</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="303"/>
         <source>&amp;Remove all local arrows</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="306"/>
         <source>Rotate View Cl&amp;ockwise</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="309"/>
         <source>Rotate View Co&amp;unterclockwise</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="312"/>
         <source>Game &amp;information</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="315"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the 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="641"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
@@ -9409,152 +9250,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9618,24 +9449,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9662,108 +9492,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9771,32 +9518,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9832,7 +9569,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9840,19 +9577,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9860,37 +9597,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9904,22 +9631,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9927,64 +9684,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -9992,17 +9741,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10018,52 +9767,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10164,133 +9908,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <source>Move selected set to the top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <source>Move selected set to the bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</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="135"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10298,72 +10042,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</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="229"/>
         <source>Group by Type</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="230"/>
         <source>Group by Mana Value</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="231"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</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="239"/>
         <source>Sort by Name</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="240"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -10398,7 +10142,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -10479,7 +10223,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -10631,7 +10375,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
@@ -11052,8 +10796,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -11073,102 +10816,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <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="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</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="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</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="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
@@ -11204,246 +10943,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_en_US.ts b/cockatrice/translations/cockatrice_en_US.ts
index 254ead590..c74e63114 100644
--- a/cockatrice/translations/cockatrice_en_US.ts
+++ b/cockatrice/translations/cockatrice_en_US.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Refresh</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Parse Set Name and Number (if available)</translation>
     </message>
@@ -36,62 +36,62 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <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="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation>Are you sure?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation>Save deck</translation>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <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>
@@ -133,168 +133,202 @@ Please check that the directory is writable and try again.</translation>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation> seconds</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation>Confirm Change</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Theme settings</translation>
     </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>Current theme:</source>
         <translation>Current theme:</translation>
     </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>Open themes folder</source>
         <translation>Open themes folder</translation>
     </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>Home tab background source:</source>
         <translation>Home tab background source:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <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="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation>Disabled</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <source>Display card name of background in bottom right:</source>
-        <translation>Display card name of background in bottom right:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation>Menu settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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="734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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/dialogs/dlg_settings.cpp" line="736"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Card rendering</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <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="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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="742"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <source>Use rounded card corners</source>
         <translation>Use rounded card corners</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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="748"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation> rows</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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="752"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation>Card counters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</source>
         <translation>Counter %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
         <source>Hand layout</source>
         <translation>Hand layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>Enable left justification</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Table grid layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Invert vertical coordinate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximum font size for information displayed on cards:</translation>
     </message>
@@ -302,12 +336,7 @@ Please check that the directory is writable and try again.</translation>
 <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>Back to results</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation>Open Deck in Deck Editor</translation>
     </message>
@@ -627,22 +656,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation>View related cards</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <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="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -678,124 +707,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation>Re&amp;veal to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation>&amp;All players</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation>View related cards</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation>Token: </translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</source>
         <translation>All tokens</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="439"/>
         <source>&amp;Select All</source>
         <translation>&amp;Select All</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="440"/>
         <source>S&amp;elect Row</source>
         <translation>S&amp;elect Row</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation>S&amp;elect Column</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation>&amp;Play</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation>&amp;Hide</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation>Play &amp;Face Down</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
-        <translation>Skip &amp;untapping</translation>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Toggle &amp;normal untapping</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <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="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation>&amp;Clone</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <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="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation>Unattac&amp;h</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation>&amp;Draw arrow...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation>&amp;Set annotation...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation>Ca&amp;rd counters</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation>&amp;Add counter (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Remove counter (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>&amp;Set counters (%1)...</translation>
     </message>
@@ -811,133 +840,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>their hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <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="187"/>
+        <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="189"/>
         <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="190"/>
-        <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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation>their library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>their library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>their graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>their exile</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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="203"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</comment>
+        <translation>their sideboard</translation>
+    </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>%1&apos;s sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
-        <source>their sideboard</source>
-        <comment>nominative</comment>
-        <translation>their sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
-        <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="212"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>%1&apos;s custom zone &apos;%2&apos;</translation>
@@ -999,7 +1028,7 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation>Card Database</translation>
     </message>
@@ -1007,7 +1036,7 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Card Info</translation>
     </message>
@@ -1030,32 +1059,32 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
         <translation>Add to Sideboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation>Select Printing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <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="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Add card to &amp;sideboard</translation>
     </message>
@@ -1063,32 +1092,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation>Banner Card</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation>Main Type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation>Mana Cost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation>Colors</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation>Select Printing</translation>
     </message>
@@ -1161,17 +1190,17 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <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="140"/>
         <source>&amp;Clear all filters</source>
         <translation>&amp;Clear all filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation>Delete selected</translation>
     </message>
@@ -1294,7 +1323,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation>Printing Selector</translation>
     </message>
@@ -1302,166 +1331,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Update Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Success</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <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="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <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="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>Add URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>Edit URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation>Network Cache Size:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation>Redirect Cache TTL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation>Picture Cache Size:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>Add New URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>Remove URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>Day(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Updating...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Choose path</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>URL Download Priority</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>Download Spoilers Automatically</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Location:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Last Change</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <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="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <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="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <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="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>Delete Downloaded Images</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>Reset Download URLs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation>On-disk cache for downloaded pictures</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>In-memory cache for pictures not currently on screen</translation>
     </message>
@@ -1469,32 +1498,32 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation>Undo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation>Redo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation>[redo] </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation>[undo] </translation>
     </message>
@@ -1502,27 +1531,27 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation>Count</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Number</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation>Provider ID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Card</translation>
     </message>
@@ -1530,12 +1559,12 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation>Common deck formats (%1)</translation>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation>All files (*.*)</translation>
     </message>
@@ -1632,94 +1661,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <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="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <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="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <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="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation>Annotated</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <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="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <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="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <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="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <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="488"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <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="415"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation>Delete failed</translation>
     </message>
@@ -1752,32 +1781,32 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
         <translation>Set format to %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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="257"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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="275"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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="299"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation>Added</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation>Removed</translation>
     </message>
@@ -1844,30 +1873,30 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
         <translation>Sideboard locked</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <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="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -2362,17 +2391,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <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="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation>Invalid deck list.</translation>
     </message>
@@ -2873,17 +2902,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Invalid deck list.</translation>
     </message>
@@ -2891,45 +2920,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <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="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <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="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
         <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="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2954,73 +2983,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
         <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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <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="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation>Number of hits:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation>Auto play hits</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>Invalid filter</translation>
     </message>
@@ -3182,12 +3178,12 @@ Your email will be used to verify your account.</translation>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3204,7 +3200,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3221,7 +3217,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3234,7 +3230,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3243,7 +3239,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3252,7 +3248,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3265,59 +3261,59 @@ 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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Appearance</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>User Interface</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>Card Sources</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Sound</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Shortcuts</translation>
     </message>
@@ -3634,67 +3630,67 @@ You may have to manually download the new version.</translation>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation>Odds (%)</translation>
     </message>
@@ -4142,143 +4138,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Choose path</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Personal settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Language:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>Paths</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation> days</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation>Last update check on %1 (%2 days ago)</translation>
     </message>
@@ -4286,47 +4282,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/player/menu/grave_menu.cpp" line="97"/>
         <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/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <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/player/menu/grave_menu.cpp" line="106"/>
         <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/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation>Reveal random card to...</translation>
     </message>
@@ -4334,88 +4330,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation>&amp;View hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation>Sort hand by...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation>Mana Value</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation>Take &amp;mulligan (Choose hand size)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation>Take mulligan (Same hand size)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation>Take mulligan (Hand size - 1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation>&amp;Move hand to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Top of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Bottom of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation>&amp;Reveal hand to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation>All players</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation>Reveal r&amp;andom card to...</translation>
     </message>
@@ -4423,52 +4419,52 @@ You may have to manually download the new version.</translation>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation>Create New Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation>Browse Decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation>Browse Card Database</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation>Browse EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation>Browse Archidekt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation>View Replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation>Quit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation>Connecting...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation>Connect</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation>Play</translation>
     </message>
@@ -4476,213 +4472,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</source>
         <translation>&amp;Library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
         <source>&amp;View library</source>
         <translation>&amp;View library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <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="213"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
         <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="214"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
         <source>Reveal &amp;library to...</source>
         <translation>Reveal &amp;library to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
         <source>Lend library to...</source>
         <translation>Lend library to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
         <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="217"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
         <source>&amp;Top of library...</source>
         <translation>&amp;Top of library...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
         <source>&amp;Bottom of library...</source>
         <translation>&amp;Bottom of library...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
         <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="220"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
         <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="221"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
         <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="223"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
         <source>&amp;Draw card</source>
         <translation>&amp;Draw card</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
         <source>D&amp;raw cards...</source>
         <translation>D&amp;raw cards...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
         <source>&amp;Undo last draw</source>
         <translation>&amp;Undo last draw</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
         <source>Shuffle</source>
         <translation>Shuffle</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
         <source>&amp;Play top card</source>
         <translation>&amp;Play top card</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
         <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="231"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
         <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="232"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
         <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="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <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="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <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="235"/>
-        <source>Move top cards to graveyard face down...</source>
-        <translation>Move top cards to graveyard face down...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="236"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <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="237"/>
-        <source>Move top cards to exile face down...</source>
-        <translation>Move top cards to exile face down...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="238"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <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="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation>Shuffle top cards...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation>&amp;Draw bottom card</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <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="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation>&amp;Play bottom card</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <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="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <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="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <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="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <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="248"/>
-        <source>Move bottom cards to graveyard face down...</source>
-        <translation>Move bottom cards to graveyard face down...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="249"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <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="250"/>
-        <source>Move bottom cards to exile face down...</source>
-        <translation>Move bottom cards to exile face down...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="251"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <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="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation>Shuffle bottom cards...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation>&amp;All players</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <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="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Number of cards: (max. %1)</translation>
     </message>
@@ -4780,8 +4756,18 @@ Will now login.</source>
 Will now login.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Number of players</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <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="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Player %1</translation>
     </message>
@@ -4884,8 +4870,8 @@ Will now login.</translation>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -5293,36 +5279,36 @@ Local version is %1, remote version is %2.</translation>
         <translation>Show/Hide</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>New Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice installed</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>Card database</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5331,29 +5317,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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Open settings</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>New sets found</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5364,17 +5350,17 @@ Set codes: %1
 Do you want to enable them?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>View sets</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Welcome</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5383,65 +5369,65 @@ 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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <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="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <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="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation>Card database update running.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <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="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation>Unknown error occurred.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <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="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5452,55 +5438,55 @@ This is most likely not a problem, but this message might mean there is a new ve
 To update your client, go to Help -&gt; Check for Updates.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Load sets/cards</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation>Selected file cannot be found.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <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="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Sets/cards failed to import.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation>Reset Password</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <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>
     </message>
@@ -5551,7 +5537,7 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation>Mana Base</translation>
     </message>
@@ -5705,610 +5691,590 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation> from play</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation> from their graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation> from exile</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation> from their hand</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <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="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <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="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <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="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <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="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <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="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation> from their library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation> from sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation> from the stack</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <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="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <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="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <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="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <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="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <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="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <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="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <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="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <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="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 destroys %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>a card</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="311"/>
-        <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/log/message_log_widget.cpp" line="313"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="317"/>
-        <source>%1 exiles %2%3 face down.</source>
-        <translation>%1 exiles %2%3 face down.</translation>
-    </message>
     <message>
         <location filename="src/game/log/message_log_widget.cpp" line="319"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 exiles %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation>%1 plays %2%3 face down.</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 plays %2%3.</translation>
     </message>
     <message>
-        <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>%1 moves %2%3 to custom zone &apos;%4&apos; face down.</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="349"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation>bottom</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation>top</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <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="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <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="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <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="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>The game has started.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <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="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <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="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <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="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <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="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <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="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 reveals %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <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="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 reveals %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>reversed</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>Heads</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>Tails</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>%1&apos;s turn.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <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>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <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>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <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="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <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="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <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="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 taps their permanents.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 untaps their permanents.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 taps %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 untaps %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 shuffles %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 unattaches %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <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="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 undoes their last draw (%2).</translation>
     </message>
@@ -6316,110 +6282,110 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>Word1 Word2 Word3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>Add New Message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>Edit Message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation>Remove Message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Add message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Message:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>Edit message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>Chat settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>Custom alert words</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>Enable chat mentions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>Enable mention completer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation>In-game message macros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <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="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>Invert text color</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <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="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <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="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <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="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(Color is hexadecimal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separate words with a space, alphanumeric characters only</translation>
     </message>
@@ -6432,37 +6398,32 @@ Cockatrice will now reload the card database.</translation>
         <translation>Move to</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <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="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <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="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <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="66"/>
-        <source>T&amp;able</source>
-        <translation>T&amp;able</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exile</translation>
     </message>
@@ -6604,57 +6565,57 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Untap step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Upkeep step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Draw step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>First main phase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Beginning of combat step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Declare attackers step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Declare blockers step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Combat damage step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>End of combat step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>Second main phase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>End of turn step</translation>
     </message>
@@ -6671,138 +6632,134 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation>View top cards of library</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Number of cards: (max. %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation>View bottom cards of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation>Shuffle top cards of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation>Shuffle bottom cards of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation>Draw hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation>0 and lower are in comparison to current hand size</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation>Draw cards</translation>
     </message>
-    <message>
-        <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>grave</translation>
-    </message>
     <message>
         <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>exile</translation>
+        <source>Move top cards to grave</source>
+        <translation>Move top cards to grave</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation>Move top cards to %1</translation>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
+        <translation>Move top cards to exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation>Move bottom cards to %1</translation>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <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="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <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="786"/>
         <source>Draw bottom cards</source>
         <translation>Draw bottom cards</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <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="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation>Create tokens</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation>Number:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation>Place card X cards from top of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation>Which position should this card be placed:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation>(max. %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation>Change power/toughness</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation>Change stats to:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation>Set annotation</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <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="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation>Set counters</translation>
     </message>
@@ -6810,69 +6767,48 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation>Player &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <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>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>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
+        <translation>S&amp;ay</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <source>Display Navigation Buttons</source>
         <translation>Display Navigation Buttons</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="155"/>
-        <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation>Preference</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation>Pin Printing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation>Unpin Printing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation>Show Related cards</translation>
     </message>
@@ -6921,25 +6857,17 @@ This setting means you&apos;ll only see the default printing for each card, inst
         <translation>Release Date</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation>Descending</translation>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7078,45 +7006,6 @@ This setting means you&apos;ll only see the default printing for each card, inst
         <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>
@@ -7265,37 +7154,37 @@ Are you sure you would like to disable this feature?</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</source>
         <translation>&amp;View exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;Move exile to...</source>
         <translation>&amp;Move exile to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Top of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Bottom of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Graveyard</translation>
     </message>
@@ -7338,14 +7227,6 @@ Are you sure you would like to disable this feature?</translation>
         <translation>Games</translation>
     </message>
 </context>
-<context>
-    <name>SayMenu</name>
-    <message>
-        <location filename="src/game/player/menu/say_menu.cpp" line="16"/>
-        <source>S&amp;ay</source>
-        <translation>S&amp;ay</translation>
-    </message>
-</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -7410,53 +7291,53 @@ Are you sure you would like to disable this feature?</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation>Restore all default shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation>Clear all default shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>Section:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>Action:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>Shortcut:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <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="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation>Clear all shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation>Search by shortcut name</translation>
     </message>
@@ -7525,27 +7406,27 @@ Please check your shortcut settings!</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>Enable &amp;sounds</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>Current sounds theme:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation>Test system sound engine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>Sound settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>Master volume</translation>
     </message>
@@ -7761,123 +7642,59 @@ Please check your shortcut settings!</translation>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <source>Desc.</source>
         <translation>Desc.</translation>
     </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>AND</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="392"/>
-        <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="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation>Deck name...</translation>
-    </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>Owner...</translation>
-    </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>Packages</translation>
-    </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>Advanced Filters</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation>Bracket:</translation>
-    </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>Any</translation>
-    </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>Contains card...</translation>
-    </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>Commander...</translation>
-    </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>Tag...</translation>
-    </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>Deck Size</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation>Cards:</translation>
-    </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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <source>Asc.</source>
         <translation>Asc.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation>Sort by:</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
+        <translation>Any Bracket</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation>Filter by:</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
+        <translation>Deck name contains...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation>Display Settings</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</source>
+        <translation>Owner name contains...</translation>
     </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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation>Disabled</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <source>Search</source>
         <translation>Search</translation>
     </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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation>Formats</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation>Min. # of Cards:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation>Page:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation>Archidekt: </translation>
     </message>
@@ -7885,52 +7702,60 @@ Please check your shortcut settings!</translation>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>Card Info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation>Card Database</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation>Printing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>Reset layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Deck: %1</translation>
     </message>
@@ -7938,55 +7763,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <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="300"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="306"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation>Printing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation>Reset layout</translation>
     </message>
@@ -8051,7 +7882,7 @@ Please check your shortcut settings!</translation>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>New folder</translation>
     </message>
@@ -8133,18 +7964,18 @@ Please enter a name:</translation>
         <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="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation>Delete remote decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Name of new folder:</translation>
     </message>
@@ -8162,12 +7993,12 @@ Please enter a name:</translation>
         <translation>Visual Deck Storage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation>Could not open deck at %1</translation>
     </message>
@@ -8216,191 +8047,197 @@ Please enter a name:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>Replay</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>Game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>Player List</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>Card Info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</source>
         <translation>Messages</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>Replay Timeline</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>&amp;Phases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>&amp;Game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Next &amp;phase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <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="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>Next &amp;turn</source>
         <translation>Next &amp;turn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>Reverse turn order</source>
         <translation>Reverse turn order</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="303"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <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="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="309"/>
         <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="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="312"/>
         <source>Game &amp;information</source>
         <translation>Game &amp;information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
         <source>Un&amp;concede</source>
         <translation>Un&amp;concede</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Concede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Leave game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>C&amp;lose replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Focus Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;Say:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</source>
         <translation>Selected cards</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="338"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>Reset layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Concede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>Unconcede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Leave game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <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="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <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="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>You have been kicked out of the game.</translation>
     </message>
@@ -9503,152 +9340,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>General interface settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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/dialogs/dlg_settings.cpp" line="965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <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="968"/>
-        <source>Show selection counter during drag selection</source>
-        <translation>Show selection counter during drag selection</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
-        <source>Show total selection counter</source>
-        <translation>Show total selection counter</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>Notifications settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation>Enable notifications in taskbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Animation settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Tap/untap animation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation>Deck editor/storage settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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="979"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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="980"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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="982"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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="984"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation>do nothing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <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="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation>always convert to .cod</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation>Default deck editor type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation>Classic Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation>Visual Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation>Replay settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Buffer time for backwards skip via shortcut:</translation>
     </message>
@@ -9712,25 +9539,24 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
-        <translation>Includes</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
+        <translation>Mode: Exact Match</translation>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
+        <translation>Mode: Includes</translation>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <source>Mode: Include/Exclude</source>
+        <translation>Mode: Include/Exclude</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation>Filter mode (AND/OR/NOT conjunctions of filters)</translation>
     </message>
 </context>
 <context>
@@ -9756,108 +9582,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation>Enter filename...</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>Sort by</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>Filter by</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>Save and load filters</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>Filter by exact card name</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>Filter by card main-type</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>Filter by card sub-type</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>Filter by set</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>Filter by format legality</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>Save/Load</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation>Name</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>Main Type</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>Sub Type</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation>Sets</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <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="71"/>
-        <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="72"/>
-        <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="73"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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_format_legality_filter_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Exact Match</source>
         <translation>Mode: Exact Match</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation>Mode: Includes</translation>
     </message>
@@ -9865,32 +9608,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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>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="67"/>
-        <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="68"/>
+        <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>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation>Mode: Includes</translation>
     </message>
@@ -9926,7 +9659,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation>Filter to most recent sets</translation>
     </message>
@@ -9934,19 +9667,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation>Mode: Includes</translation>
     </message>
@@ -9954,37 +9687,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="71"/>
-        <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="72"/>
-        <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="73"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation>Mode: Includes</translation>
     </message>
@@ -9998,22 +9721,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation>Visual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation>Loading database ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <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="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation>Sort by:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation>Filter by:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <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_widget.cpp" line="274"/>
+        <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_widget.cpp" line="275"/>
+        <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_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation>Filter by set</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation>Table</translation>
     </message>
@@ -10021,64 +9774,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation>Group by:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <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_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation>Sort by:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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="121"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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="96"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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="118"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation>Sample hand size</translation>
     </message>
@@ -10086,17 +9831,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10112,52 +9857,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation>None</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation>Filepath</translation>
     </message>
@@ -10258,133 +9998,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <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="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <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="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <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="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <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="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation>Default order</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <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="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>Enable all sets</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>Disable all sets</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <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="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>Card Art</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="135"/>
         <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="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>Hints</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>Manage sets</translation>
     </message>
@@ -10392,72 +10132,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <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="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</source>
         <translation>Ungrouped</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Group by Type</source>
         <translation>Group by Type</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <source>Group by Mana Value</source>
         <translation>Group by Mana Value</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Color</source>
         <translation>Group by Color</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</source>
         <translation>Unsorted</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Sort by Name</source>
         <translation>Sort by Name</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Type</source>
         <translation>Sort by Type</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation>Sort by Mana Cost</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation>Sort by Colors</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation>Sort by P/T</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation>Sort by Set</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>shuffle when closing</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>pile view</translation>
     </message>
@@ -10492,7 +10232,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>Deck Editor</translation>
     </message>
@@ -10573,7 +10313,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation>Replays</translation>
     </message>
@@ -10725,7 +10465,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>Reset Layout</translation>
     </message>
@@ -11146,9 +10886,8 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation>Toggle Skip Untapping</translation>
+        <source>Toggle Untap</source>
+        <translation>Toggle Untap</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11167,102 +10906,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="516"/>
-        <source>Play Card, Face Down</source>
-        <translation>Play Card, Face Down</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Attach Card...</source>
         <translation>Attach Card...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>Unattach Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>Clone Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>Create Token...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>Create All Related Tokens</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>Create Another Token</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>Set Annotation...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation>Select All Cards in Zone</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation>Select All Cards in Row</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation>Select All Cards in Column</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>Bottom of Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Exile</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Graveyard</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Hand</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>Top of Library</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>Battlefield, Face Down</translation>
     </message>
@@ -11298,246 +11033,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>Stack</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation>Graveyard (Multiple)</translation>
     </message>
     <message>
-        <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>Graveyard (Multiple), Face Down</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="607"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation>Exile (Multiple)</translation>
     </message>
     <message>
-        <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>Exile (Multiple), Face Down</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation>Stack Until Found</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation>Draw Bottom Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Draw Multiple Cards from Bottom...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>Draw Arrow...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation>Remove Local Arrows</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>Leave Game</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Concede</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>Roll Dice...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>Shuffle Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation>Shuffle Top Cards of Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation>Shuffle Bottom Cards of Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation>Mulligan (Same hand size)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation>Mulligan (Hand size - 1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>Draw a Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>Draw Multiple Cards...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>Undo Draw</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>Always Reveal Top Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>Always Look At Top Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation>Sort Hand by Name</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation>Sort Hand by Type</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <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="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <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="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <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="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>Rotate View Clockwise</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Rotate View Counterclockwise</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>Unfocus Text Box</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>Focus Chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>Clear Chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>Refresh</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation>Skip Forward</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation>Skip Backward</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation>Skip Forward by a lot</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation>Skip Backward by a lot</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation>Play/Pause</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation>Toggle Fast Forward</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation>Home</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation>Visual Deck Storage</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation>Deck Storage</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts
index 53fc9ac61..e80e28b52 100644
--- a/cockatrice/translations/cockatrice_es.ts
+++ b/cockatrice/translations/cockatrice_es.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Actualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,60 +36,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <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="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation>¿Estás seguro?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation>Guardar mazo</translation>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation>No hay cartas en tu mazo para exportar</translation>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation>segundos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Preferencias del tema</translation>
     </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>Current theme:</source>
         <translation>Tema actual:</translation>
     </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>Open themes folder</source>
         <translation>Abrir carpeta de temas</translation>
     </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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation>Deshabilitado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Representación de las cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation>filas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation>Contadores de carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>Disposición de la mano</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <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="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <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="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Invertir coordenada vertical</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <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>
@@ -300,12 +322,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +642,22 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation>Ver cartas relacionadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <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="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation>Mazo principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation>Banquillo</translation>
     </message>
@@ -676,124 +693,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation>&amp;Todos los jugadores</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation>Ver cartas relacionadas</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation>Ficha:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</source>
         <translation>Todas las fichas</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="439"/>
         <source>&amp;Select All</source>
         <translation>&amp;Seleccionar todo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="440"/>
         <source>S&amp;elect Row</source>
         <translation>&amp;Seleccionar fila</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation>&amp;Seleccionar columna</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation>&amp;Jugar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation>&amp;Ocultar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation>Jugar boca abajo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation>&amp;Clonar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <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="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Quitar contador (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>&amp;Establecer contadores (%1)</translation>
     </message>
@@ -809,133 +826,133 @@ 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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>su mano</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <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="187"/>
+        <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="189"/>
         <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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation>su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>su cementerio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</comment>
+        <translation>su banquillo</translation>
+    </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>su banquillo</translation>
-    </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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -997,7 +1014,7 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Información de la carta</translation>
     </message>
@@ -1028,32 +1045,32 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
         <translation>Añadir al Banquillo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <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="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Añadir carta al &amp;banquillo</translation>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <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="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <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="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,17 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <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="140"/>
         <source>&amp;Clear all filters</source>
         <translation>&amp;Limpiar todos los filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation>Borrar seleccionado</translation>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Actualizar Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <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="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <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="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>Añadir URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>Editar URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>Añadir URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>Borrar URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>Día(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Actualizando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Elegir camino</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>Prioridad de descarga de URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>Descargar Spoilers automáticamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>Localización del Spoiler:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Último cambio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <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="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <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="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <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="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>Eliminar imágenes descargadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>Reiniciar descarga de URLs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1467,32 +1484,32 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Número</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Carta</translation>
     </message>
@@ -1528,12 +1545,12 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <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="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <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="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation>Anotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <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="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <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="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <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="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <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="488"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation>Borrado fallido</translation>
     </message>
@@ -1750,32 +1767,32 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
         <translation>Banquillo bloqueado</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation>Lista de mazo inválida.</translation>
     </message>
@@ -2868,17 +2885,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Lista de mazo inválida.</translation>
     </message>
@@ -2886,43 +2903,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2941,73 +2958,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
         <translation>Cargar mazo</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>Filtro no válido</translation>
     </message>
@@ -3169,12 +3153,12 @@ Tu correo electrónico se utilizará para verificar tu cuenta.</translation>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3191,7 +3175,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3208,7 +3192,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3221,7 +3205,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3230,7 +3214,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3239,7 +3223,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3252,59 +3236,59 @@ 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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Apariencia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Interfaz de usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>Origen de la carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Sonido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Atajos de teclado</translation>
     </message>
@@ -3618,67 +3602,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4126,143 +4110,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Elija ruta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Preferencias personales</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Idioma:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>Rutas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <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/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4270,47 +4254,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/player/menu/grave_menu.cpp" line="97"/>
         <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/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <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/player/menu/grave_menu.cpp" line="106"/>
         <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/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation>Mostrar una carta al azar a...</translation>
     </message>
@@ -4318,88 +4302,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation>&amp;Ver mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation>&amp;Mover mano a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <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="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <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="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cementerio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation>&amp;Mostrar mano a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation>Mostrar una carta al azar a...</translation>
     </message>
@@ -4407,52 +4391,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation>Crear nuevo mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation>Buscar mazos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <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="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation>Ver repeticiones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation>Quitar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation>Conectar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation>Jugar</translation>
     </message>
@@ -4460,213 +4444,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</source>
         <translation>&amp;Biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
         <source>&amp;View library</source>
         <translation>&amp;Ver biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <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="213"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
         <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="214"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
         <source>Reveal &amp;library to...</source>
         <translation>Mostrar &amp;biblioteca a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
         <source>Lend library to...</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="200"/>
         <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="217"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
         <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="218"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
         <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="219"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw card</source>
         <translation>&amp;Robar carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</source>
         <translation>Barajar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
         <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="230"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <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="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation>&amp;Robar carta de la parte inferior</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation>&amp;Jugar carta de la parte inferior</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation>Poner carta de la parte inferior en la parte superior</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <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="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4766,8 +4730,18 @@ Will now login.</source>
 Iniciando sesión.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Número de jugadores</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <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="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Jugador %1</translation>
     </message>
@@ -4870,8 +4844,8 @@ Iniciando sesión.</translation>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -5278,36 +5252,36 @@ La versión local es %1, la versión remota es %2.</translation>
         <translation>Mostrar/Ocultar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>Nueva Versión</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice está instalado.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>Base de datos de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5316,29 +5290,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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Abrir preferencias</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>Nuevas ediciones encontradas</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5351,17 +5325,17 @@ Códigos de sets: %1
 ¿Quieres habilitarlos?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>Ver ediciones</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Bienvenido/a</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5370,64 +5344,64 @@ 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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <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="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <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="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation>Ocurrió un error desconocido.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5437,55 +5411,55 @@ Esto no debería ser un problema, pero este mensaje podría significar que hay u
 Para actualizar tu cliente, ve a Ayuda -&gt; Buscar Actualizaciones.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Cargar ediciones/cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <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="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <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="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Las ediciones/cartas fallaron al ser importadas.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation>Reiniciar contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <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>
     </message>
@@ -5536,7 +5510,7 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation>Base de maná</translation>
     </message>
@@ -5690,611 +5664,591 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation> del juego</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation> de su cementerio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation> del exilio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation> de su mano</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <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="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <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="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <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="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <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="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <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="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>desde su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation> desde el banquillo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation> desde la pila</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <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="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <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="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <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="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <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="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <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="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <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="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 destruye %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>una carta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="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>%1 exilia %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 juega %2%3.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation>parte inferior</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation>parte superior</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <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="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <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="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <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="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>La partida ha comenzado.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <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="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <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="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <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="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <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="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 revela %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <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="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 revela %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>Invertido.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>Normal.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>Cara</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>Cruz</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>Turno %1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <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="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <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="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <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="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <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="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <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="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>
 %1 gira sus permanentes.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <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="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 gira %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 endereza %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 baraja %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 desanexa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <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="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 deshace su último robo (%2).</translation>
     </message>
@@ -6302,110 +6256,110 @@ 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="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>Palabra1 Palabra2 Palabra3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>Añadir nuevo mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>Editar mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation>Borrar mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Añadir mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Mensaje:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>Editar mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>Preferencias de Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>Palabras de alerta personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <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="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>Habilitar completado de menciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <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="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>Invertir el color del texto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <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="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <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="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <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="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(El color es hexadecimal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separa las palabras con un espacio, solo caracteres alfanuméricos</translation>
     </message>
@@ -6418,37 +6372,32 @@ Cockatrice está recargando la base de datos de cartas.</translation>
         <translation>Mover a</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cementerio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exilio</translation>
     </message>
@@ -6590,57 +6539,57 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Paso de enderezar</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Paso de mantenimiento</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Paso de robar</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>Primera fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Paso de inicio del combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Paso de declarar atacantes</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Paso de declarar bloqueadores</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Paso de daño de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Paso de final del combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>Segunda fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Paso final</translation>
     </message>
@@ -6657,138 +6606,134 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation>Ver cartas de la parte superior de la biblioteca</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Número de cartas: (máx. %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <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/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation>Robar mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation>Robar cartas</translation>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation>Crear fichas</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation>Número:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation>Cambiar fuerza/resistencia</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation>Establecer contadores</translation>
     </message>
@@ -6796,65 +6741,48 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6903,25 +6831,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation>Fecha de lanzamiento</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation>Descendente</translation>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7060,33 +6980,6 @@ This setting means you'll only see the default printing for each card, instead o
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <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>
@@ -7235,37 +7128,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</source>
         <translation>Ver &amp;exilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;Move exile to...</source>
         <translation>&amp;Mover exilio a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
         <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="67"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
         <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="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cementerio</translation>
     </message>
@@ -7308,14 +7201,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>Partidas</translation>
     </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>
@@ -7380,53 +7265,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation>Restaurar atajos por defecto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <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="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>Sección:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>Acción:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>Atajo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <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="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7494,27 +7379,27 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>Activar &amp;sonidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>Tema de sonidos actual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <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="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>Preferencias de sonido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>Volumen maestro</translation>
     </message>
@@ -7730,123 +7615,59 @@ Por favor, revise su configuración de atajos.</translation>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7854,52 +7675,60 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>Información de la carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>Mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>Flotante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>Reinicializar la disposición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Mazo: %1</translation>
     </message>
@@ -7907,55 +7736,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <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="300"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="306"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation>Mazo</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -8020,7 +7855,7 @@ Por favor, revise su configuración de atajos.</translation>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>Nueva carpeta</translation>
     </message>
@@ -8102,18 +7937,18 @@ Por favor, introduce un nombre:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Nombre de la nueva carpeta:</translation>
     </message>
@@ -8131,12 +7966,12 @@ Por favor, introduce un nombre:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8185,191 +8020,197 @@ Por favor, introduce un nombre:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>Repetir</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>Partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>Lista de jugadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>Información de la carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</source>
         <translation>Mensajes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>Historial de partidas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>&amp;Fases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>&amp;Partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Próxima &amp;fase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <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="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>Next &amp;turn</source>
         <translation>Próximo &amp;turno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>Reverse turn order</source>
         <translation>Orden del turno invertido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="303"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <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="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="309"/>
         <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="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="312"/>
         <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="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Abandonar la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;Cerrar repetición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Resaltar chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;Decir:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</source>
         <translation>Cartas seleccionadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="338"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>Flotante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>Resetear la distribución </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>Revertir rendición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Abandonar la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <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="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <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="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>Has sido expulsado de la partida.</translation>
     </message>
@@ -9468,152 +9309,142 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>Preferencias generales de la interfaz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <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="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>Ajustes de notificaciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <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="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Preferencias de animación</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <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="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation>no hacer nada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9677,24 +9508,23 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9721,108 +9551,25 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9830,32 +9577,22 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9891,7 +9628,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9899,19 +9636,19 @@ 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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9919,37 +9656,27 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9963,22 +9690,52 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <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="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9986,64 +9743,56 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10051,17 +9800,17 @@ 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="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10077,52 +9826,47 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDeckStorageQuickSettingsWidget</name>
     <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="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10223,133 +9967,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <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="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <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="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <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="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <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="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation>Orden por defecto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <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="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>Seleccionar todos los sets</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>Deseleccionar todos los sets</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <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="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>Editor de mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>Arte de carta</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="135"/>
         <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="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>Consejos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>Mantenedor de ediciones</translation>
     </message>
@@ -10357,72 +10101,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</source>
         <translation>Desagrupado</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Group by Type</source>
         <translation>Agrupar por tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <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="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Color</source>
         <translation>Agrupar por color</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</source>
         <translation>Desordenado</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Sort by Name</source>
         <translation>Ordenar por nombre</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Type</source>
         <translation>Ordenar por tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <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="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation>Ordenar por colores</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>barajar al cerrar</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>vista de la pila</translation>
     </message>
@@ -10457,7 +10201,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>Editor de mazos</translation>
     </message>
@@ -10538,7 +10282,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation>Repeticiones</translation>
     </message>
@@ -10690,7 +10434,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>Restablecer disposición</translation>
     </message>
@@ -11111,9 +10855,8 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <source>Toggle Untap</source>
+        <translation>Alternar enderezamiento</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11132,102 +10875,98 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
     </message>
     <message>
         <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>Anexar carta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>Desanexar carta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>Clonar carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>Crear ficha...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>Crear todas las fichas relacionadas</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>Crear otra ficha</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>Escribir anotación...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>Parte inferior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Exilio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Cementerio</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Mano</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>Parte superior de la biblioteca</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>Campo de batalla, boca abajo</translation>
     </message>
@@ -11263,246 +11002,234 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>Apilar</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation>Cementerio (Multiple)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation>Exiliar (Multiple)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation>Robar carta de la parte inferior</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Robar múltiples cartas de la parte inferior...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>Dibujar flecha</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation>Eliminar flechas</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>Abandonar partida</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>Lanzar dado...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>Barajar biblioteca</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>Robar una carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>Robar múltiples cartas...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>Deshacer último robo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>Mostrar siempre la carta superior</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>Mirar siempre la carta superior</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>Rotar vista en sentido horario</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Rotar vista en sentido antihorario</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>No resaltar la caja de texto</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>Resaltar el chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>Borrar chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>Actualizar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation>Inicio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation>Almacenamiento de mazos</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation>Administración</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation>Historial</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_fi.ts b/cockatrice/translations/cockatrice_fi.ts
index 1202e1f1e..16f94f1c0 100644
--- a/cockatrice/translations/cockatrice_fi.ts
+++ b/cockatrice/translations/cockatrice_fi.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,60 +36,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Teeman asetukset</translation>
     </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>Current theme:</source>
         <translation>Nykyinen teema:</translation>
     </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>Open themes folder</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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Kortin renderöinti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>Käden layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>Järjestä vasemmalta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Pöydän grid-asetelma</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Käänteiset pystykoordinaatit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Suurin fonttikoko korteissa näkyville infoteksteille:</translation>
     </message>
@@ -300,12 +322,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +642,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -676,124 +693,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</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="439"/>
         <source>&amp;Select All</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="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -809,133 +826,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -997,7 +1014,7 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1028,32 +1045,32 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,17 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Päivitä spoilerit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Onnistui</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <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="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <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="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>Lisää URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>Muokkaa URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Päivitetään...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Valitse polku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>URL Latausprioriteetti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>Spoilerit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>Lataa spoilerit automaattisesti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>Spoilerien sijainti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Muokattu viimeksi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <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="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <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="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <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="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>Poista ladatut kuvat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>Resetoi latausten URL:t</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1467,32 +1484,32 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Numero</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Kortti</translation>
     </message>
@@ -1528,12 +1545,12 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1750,32 +1767,32 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
         <translation>Sideboard locked</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2868,17 +2885,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Pakka ei ole kelvollinen. </translation>
     </message>
@@ -2886,43 +2903,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2941,73 +2958,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3168,12 +3152,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3190,7 +3174,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3207,7 +3191,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3216,7 +3200,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3225,7 +3209,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3234,7 +3218,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3243,59 +3227,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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Yleinen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Ulkonäkö</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Käyttöliittymä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>Korttien lähteet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Äänet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Pikanäppäimet</translation>
     </message>
@@ -3609,67 +3593,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4117,143 +4101,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Valitse polku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Henkilökohtaiset asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Kieli:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>Polut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4261,47 +4245,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4309,88 +4293,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4398,52 +4382,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4451,213 +4435,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4755,8 +4719,18 @@ Will now login.</source>
 Kirjautuu.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Pelaajien lukumäärä</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation>Anna pelaajien lukumäärä.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Pelaaja %1</translation>
     </message>
@@ -4859,8 +4833,8 @@ Kirjautuu.</translation>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
@@ -5267,36 +5241,36 @@ Paikallinen versio on %1, etäversio on %2.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>Uusi versio</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice asennettu</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>Korttitietokanta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5305,46 +5279,46 @@ 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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Kyllä</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Avaa asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>Löytyi uusia settejä!</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <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="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>Näytä setit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Tervetuloa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5353,64 +5327,64 @@ 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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Tietoa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <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="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <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="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5421,55 +5395,55 @@ This is most likely not a problem, but this message might mean there is a new ve
 To update your client, go to Help -&gt; Check for Updates.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Lataa setit/kortit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation>Selected file cannot be found.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <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="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Sets/cards failed to import.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <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>
     </message>
@@ -5520,7 +5494,7 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5674,610 +5648,590 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>pelistä</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation>Graveyardilta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation>exilestä</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation>kädestään</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <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="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <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="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <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="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation>pakan alta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s library</source>
         <translation>%1n pakasta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>pakasta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation>sideboardilta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation>stäkistä</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 luovutti.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <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="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <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="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <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="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <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="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <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="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 tuhoaa kortin %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>kortti</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="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>%1 laittaa exileen kortin %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <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="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <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="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <source>The game has been closed.</source>
         <translation>Peli on suljettu.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>Peli alkaa.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <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="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <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="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <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="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <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="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 reveals %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <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="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 reveals %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>käänteinen</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>normaali</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>Kruuna</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>Klaava</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>%1n vuoro.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <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="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <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="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <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="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <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="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 täppää kortin %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 untäppää kortin %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 sekoittaa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 irrottaa kortin %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <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="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 peruuttaa viimeisimmän kortinnostonsa. (%2).</translation>
     </message>
@@ -6285,110 +6239,110 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>Word1 Word2 Word3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Lisää viesti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Viesti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>Edit message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>Keskusteluasetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>Custom alert words</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>Salli keskustelumaininnat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>Enable mention completer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation>Pelinsisäiset viestimakrot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>Käänteinen tekstin väri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <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="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <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="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <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="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(Väri on heksadesimaaliluku)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separate words with a space, alphanumeric characters only</translation>
     </message>
@@ -6401,37 +6355,32 @@ Cockatrice will now reload the card database.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6573,57 +6522,57 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Untap-kohta</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Upkeep-kohta</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Nostokohta</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>First main phase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Beginning of combat step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Declare attackers step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Declare blockers step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Combat damage step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>End of combat step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>Second main phase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>End of turn step</translation>
     </message>
@@ -6640,138 +6589,134 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6779,65 +6724,48 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6886,25 +6814,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7043,33 +6963,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7218,37 +7111,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7291,14 +7184,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>Games</translation>
     </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>
@@ -7363,53 +7248,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation>Restore all default shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation>Clear all default shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>Section:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>Action:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>Shortcut:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <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="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7478,27 +7363,27 @@ Please check your shortcut settings!</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>Enable &amp;sounds</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>Current sounds theme:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation>Test system sound engine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>Sound settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>Master volume</translation>
     </message>
@@ -7714,123 +7599,59 @@ Please check your shortcut settings!</translation>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7838,52 +7659,60 @@ Please check your shortcut settings!</translation>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>Card Info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>Reset layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Deck: %1</translation>
     </message>
@@ -7891,55 +7720,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -8004,7 +7839,7 @@ Please check your shortcut settings!</translation>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>New folder</translation>
     </message>
@@ -8086,18 +7921,18 @@ Please enter a name:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Name of new folder:</translation>
     </message>
@@ -8115,12 +7950,12 @@ Please enter a name:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8169,191 +8004,197 @@ Please enter a name:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>Replay</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>Game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>Player List</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>Card Info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</source>
         <translation>Messages</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>Replay Timeline</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>&amp;Phases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>&amp;Game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Next &amp;phase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <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="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>Next &amp;turn</source>
         <translation>Next &amp;turn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>Reverse turn order</source>
         <translation>Käännä vuorojärjestys</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="303"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <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="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="309"/>
         <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="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="312"/>
         <source>Game &amp;information</source>
         <translation>Game &amp;information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Concede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Leave game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>C&amp;lose replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Focus Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;Say:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>Reset layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Concede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>Unconcede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Poistu pelistä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <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="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the 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="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>You have been kicked out of the game.</translation>
     </message>
@@ -9455,152 +9296,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>General interface settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <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="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>Ilmoitusasetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <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="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Animaatioasetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Tap/untap animation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9664,24 +9495,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9708,108 +9538,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9817,32 +9564,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9878,7 +9615,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9886,19 +9623,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9906,37 +9643,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9950,22 +9677,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9973,64 +9730,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10038,17 +9787,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10064,52 +9813,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10210,133 +9954,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <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="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <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="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <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="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <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="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation>Default order</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <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="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>Enable all sets</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>Disable all sets</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <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="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>Card Art</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="135"/>
         <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="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>Hints</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>Manage sets</translation>
     </message>
@@ -10344,72 +10088,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</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="229"/>
         <source>Group by Type</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="230"/>
         <source>Group by Mana Value</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="231"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</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="239"/>
         <source>Sort by Name</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="240"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>shuffle when closing</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>pile view</translation>
     </message>
@@ -10444,7 +10188,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>Deck Editor</translation>
     </message>
@@ -10525,7 +10269,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -10677,7 +10421,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>Reset Layout</translation>
     </message>
@@ -11098,9 +10842,8 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <source>Toggle Untap</source>
+        <translation>Toggle Untap</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11119,102 +10862,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <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>Attach Card...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>Unattach Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>Clone Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>Create Token...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>Create All Related Tokens</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>Create Another Token</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>Set Annotation...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>Bottom of Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Exile</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Graveyard</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Hand</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>Top of Library</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>Battlefield, Face Down</translation>
     </message>
@@ -11250,246 +10989,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>Stack</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation>Graveyard (Multiple)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation>Exile (Multiple)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>Draw Arrow...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation>Remove Local Arrows</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>Leave Game</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Concede</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>Roll Dice...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>Shuffle Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>Draw a Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>Draw Multiple Cards...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>Undo Draw</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>Always Reveal Top Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>Rotate View Clockwise</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Rotate View Counterclockwise</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>Unfocus Text Box</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>Focus Chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>Clear Chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>Refresh</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_fr.ts b/cockatrice/translations/cockatrice_fr.ts
index f50d3afd6..d01e564c0 100644
--- a/cockatrice/translations/cockatrice_fr.ts
+++ b/cockatrice/translations/cockatrice_fr.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Rafraîchir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <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,62 +36,62 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <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="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <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="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation>Sauvegarder le deck</translation>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <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>
@@ -133,168 +133,202 @@ Vérifiez que le répertoire ne soit pas en lecture seule et réessayez.</transl
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation>secondes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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 fonction 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 fonction ?</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="672"/>
+        <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 fonction activera le sélecteur 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 le sélecteur d&apos;impression.
+
+Vous pouvez également utiliser le gestionnaire de d&apos;extension pour personnaliser l&apos;ordre de tri des impressions dans le sélecteur 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 fonction ?</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="681"/>
+        <source>Confirm Change</source>
+        <translation>Confirmer le changement</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Paramètres du thème</translation>
     </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>Current theme:</source>
         <translation>Thème actuel :</translation>
     </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>Open themes folder</source>
         <translation>Ouvrir le dossier des thèmes</translation>
     </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>Home tab background source:</source>
         <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="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <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="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation>Désactivé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation>Options du Menu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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="734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Rendu des cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <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="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <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="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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="748"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation>lignes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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="752"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation>Marqueurs sur la carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</source>
         <translation>Marqueur %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
         <source>Hand layout</source>
         <translation>Disposition de la main</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>Activer la justification à gauche</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Disposition en forme de grille</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <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="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <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>
@@ -302,12 +336,7 @@ Vérifiez que le répertoire ne soit pas en lecture seule et réessayez.</transl
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -627,22 +656,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <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="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <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="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation>Deck principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation>Réserve</translation>
     </message>
@@ -678,124 +707,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation>Révéler à...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation>&amp;Tous les joueurs</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation>Voir les cartes associées</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation>Jeton :</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</source>
         <translation>Tout les jetons</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="439"/>
         <source>&amp;Select All</source>
         <translation>&amp;Sélectionner Tout</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="440"/>
         <source>S&amp;elect Row</source>
         <translation>Sél&amp;ectionne une ligne</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation>Sél&amp;ectionne une colonne</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation>&amp;Jouer</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation>&amp;Cacher</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation>Jouer &amp;Face Cachée</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <source>&amp;Tap / Untap</source>
         <extracomment>Turn sideways or back again</extracomment>
         <translation>&amp;Engager / Dégager</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
-        <source>Skip &amp;untapping</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Activer dégagement &amp;normal</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <source>T&amp;urn Over</source>
         <extracomment>Turn face up/face down</extracomment>
         <translation>Reto&amp;urner</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation>&amp;Regarder furtivement la carte face cachée</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation>&amp;Cloner</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation>Attac&amp;her à une carte...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation>Détac&amp;her</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation>&amp;Tracer une flèche...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation>&amp;Annoter...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation>Ma&amp;rqueurs sur la carte</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation>&amp;Ajouter un marqueur (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Retirer un marqueur (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>&amp;Changer le nombre de marqueurs (%1)...</translation>
     </message>
@@ -811,133 +840,133 @@ 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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>sa main</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation>main de %1</translation>
     </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="180"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation>sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation>bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation>de sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation>de la bibliothèque de %1</translation>
     </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation>sa bibliothèque</translation>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <source>%1&apos;s library</source>
+        <comment>reveal zone</comment>
+        <translation>bibliothèque de %1</translation>
+    </message>
     <message>
         <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <source>their library</source>
-        <comment>reveal zone</comment>
-        <translation>sa bibliothèque</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
-        <source>%1&apos;s library</source>
-        <comment>reveal zone</comment>
-        <translation>bibliothèque de %1</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation>sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation>bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation>bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>son cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation>le cimetière de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>sa zone d&apos;exil</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation>la zone d&apos;exil de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation>sa réserve</translation>
     </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="201"/>
+        <source>%1&apos;s sideboard</source>
+        <comment>look at zone</comment>
+        <translation>la réserve de %1</translation>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</comment>
+        <translation>sa réserve</translation>
+    </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>la réserve de %1</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
-        <source>their sideboard</source>
-        <comment>nominative</comment>
-        <translation>sa réserve</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
-        <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation>la réserve de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation>sa zone personnalisée &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>La zone personnalisée &apos;%2&apos; de %1</translation>
@@ -999,7 +1028,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1007,7 +1036,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Infos de la carte</translation>
     </message>
@@ -1030,32 +1059,32 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
         <translation>Ajouter à la réserve</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <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="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Show on EDHRec (Commander)</source>
         <translation>Afficher sur EDHRec (Commandant)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <source>Show on EDHRec (Card)</source>
         <translation>Afficher sur EDHRec (carte)</translation>
     </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="207"/>
         <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="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Ajouter carte à la ré&amp;serve</translation>
     </message>
@@ -1063,32 +1092,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <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="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation>Type principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <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="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation>Choisir l&apos;impression</translation>
     </message>
@@ -1161,17 +1190,17 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation>Filtres</translation>
     </message>
     <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="140"/>
         <source>&amp;Clear all filters</source>
         <translation>&amp;Effacer tous les filtres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation>Enlever la sélection</translation>
     </message>
@@ -1294,7 +1323,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation>Sélection d&apos;impression</translation>
     </message>
@@ -1302,166 +1331,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Mettre à jour les spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Réussite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <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="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <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="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>Ajouter une URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>Modifier l&apos;URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <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="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation>Rediriger le TTL du cache :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation>Taille du cache des images :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>Ajouter Nouveau Lien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>Effacer Lien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>Jour(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Mise à jour...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Choisir le chemin</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <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="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <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="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>Emplacement des spoilers :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Dernier changement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <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="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <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="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <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="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <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="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>Réinitialiser les URL de téléchargement </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation>Cache pour les images téléchargées</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>Cache en mémoire pour les imges non affichées actuellement</translation>
     </message>
@@ -1469,32 +1498,32 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1502,27 +1531,27 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation>Compter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation>Édition</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation>Provider ID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Carte</translation>
     </message>
@@ -1530,12 +1559,12 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation>Formats de decks courants (%1)</translation>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation>Tous les fichiers (*.*)</translation>
     </message>
@@ -1632,94 +1661,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <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="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <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="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <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="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation>Avec annotations</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <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="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <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="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <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="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <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="488"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <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="415"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation>Suppression échouée</translation>
     </message>
@@ -1752,32 +1781,32 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1844,30 +1873,30 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
         <translation>Réserve verrouillée</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <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="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -2362,17 +2391,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <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="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation>Liste de deck invalide.</translation>
     </message>
@@ -2873,17 +2902,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Liste de Deck invalide.</translation>
     </message>
@@ -2891,43 +2920,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation>Charger un deck depuis un site web</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation>Erreur réseau : %1</translation>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation>Données de deck vide reçues.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <source>Failed to parse deck data: %1</source>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2952,73 +2981,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
         <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 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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <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="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <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="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <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="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>Filtre invalide</translation>
     </message>
@@ -3179,12 +3175,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3201,7 +3197,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3218,7 +3214,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3231,7 +3227,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3240,7 +3236,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3249,7 +3245,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3262,59 +3258,59 @@ 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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Apparence</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Interface utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>Origine de carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Son</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Raccourcis</translation>
     </message>
@@ -3631,67 +3627,67 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4139,143 +4135,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Paramètres personnels</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Langue :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <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/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <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/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <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>
@@ -4283,47 +4279,47 @@ 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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <source>&amp;View graveyard</source>
         <translation>&amp;Voir le cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;Move graveyard to...</source>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <source>&amp;Top of library</source>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <source>&amp;Bottom of library</source>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <source>&amp;All players</source>
         <translation>&amp;Tous les joueurs</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation>&amp;Main</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <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/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation>Révéler une carte au hasard à...</translation>
     </message>
@@ -4331,88 +4327,88 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation>&amp;Main</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation>&amp;Voir la main</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation>&amp;Déplacer la main vers…</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation>&amp;Révéler la main à...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation>Révéler une c&amp;arte au hasard à...</translation>
     </message>
@@ -4420,52 +4416,52 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation>Créer un Nouveau Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation>Parcourir les Decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation>Parcourir la Base de Carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation>Parcourir EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation>Voir les replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation>Connection...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation>Se connecter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation>Jouer</translation>
     </message>
@@ -4473,213 +4469,193 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</source>
         <translation>&amp;Bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
         <source>&amp;View library</source>
         <translation>&amp;Voir la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</source>
         <translation>Voir les cartes du &amp;dessus de la bibliothèque...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
         <source>View bottom cards of library...</source>
         <translation>Voir les cartes du dessous de la bibliothèque...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
         <source>Reveal &amp;library to...</source>
         <translation>Révéler la &amp;bibliothèque à...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
         <source>Lend library to...</source>
         <translation>Prêter la bibliothèque à...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
         <source>Reveal &amp;top cards to...</source>
         <translation>Révéler les cartes du &amp;dessus à...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
         <source>&amp;Top of library...</source>
         <translation>&amp;Dessus de la bibliothèque...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
         <source>&amp;Bottom of library...</source>
         <translation>&amp;Dessous de la bibliothèque...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
         <source>&amp;Always reveal top card</source>
         <translation>&amp;Toujours révéler la carte du dessus</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
         <source>&amp;Always look at top card</source>
         <translation>&amp;Toujours voir la carte du dessus</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
         <source>&amp;Open deck in deck editor</source>
         <translation>&amp;Ouvrir le deck dans l&apos;éditeur</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
         <source>&amp;Draw card</source>
         <translation>&amp;Piocher une carte</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
         <source>D&amp;raw cards...</source>
         <translation>P&amp;iocher plusieurs cartes...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
         <source>&amp;Undo last draw</source>
         <translation>&amp;Annuler la dernière pioche</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
         <source>Shuffle</source>
         <translation>Mélanger</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
         <source>&amp;Play top card</source>
         <translation>&amp;Jouer la carte du dessus</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
         <source>Play top card &amp;face down</source>
         <translation>Jouer la carte du dessus &amp;face cachée</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
         <source>Put top card on &amp;bottom</source>
         <translation>Placer la carte du dessus au-&amp;dessous</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
         <source>Move top card to grave&amp;yard</source>
         <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="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation>E&amp;xiler la carte du dessus</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation>Mettre les cartes du dessus dans le &amp;cimetière...</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation>&amp;Exiler les cartes du dessus...</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <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="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation>Mélanger les cartes du dessus...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation>&amp;Piocher la carte du dessous </translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation>P&amp;iocher les cartes du dessous...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation>&amp;Jouer la carte du dessous</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation>Jouer la carte du dessous &amp;face cachée</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <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="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation>E&amp;xiler la carte du dessous</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation>Mettre les cartes du dessus dans le &amp;cimetière...</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation>&amp;Exiler les cartes du dessous...</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation>Placer la carte du dessous au-&amp;dessus</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation>Mélanger les cartes du dessous...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation>&amp;Tous les joueurs</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <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="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Nombre de cartes : (max. %1)</translation>
     </message>
@@ -4779,8 +4755,18 @@ Will now login.</source>
 Connexion en cours.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Nombre de joueurs</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <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="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Joueur %1</translation>
     </message>
@@ -4883,8 +4869,8 @@ Connexion en cours.</translation>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
@@ -5292,36 +5278,36 @@ La version locale est %1, la nouvelle version est %2.</translation>
         <translation>Montrer/Cacher</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>Nouvelle version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Installation de Cockatrice terminée</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>Base de données de cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5330,29 +5316,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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Ouvrir les paramètres</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>Nouvelles éditions détectées</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5365,17 +5351,17 @@ 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="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>Voir les éditions</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Bienvenue</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5384,65 +5370,65 @@ 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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Informations</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <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="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <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="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <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="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <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="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation>Une erreur inconnue est arrivée.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <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="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5453,55 +5439,55 @@ Ce n&apos;est probablement pas un problème, mais ce message peut signifier qu&a
 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="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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Charger des éditions/cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <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="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <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="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Échec de l&apos;importation des éditions/cartes.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation>Réinitialiser le mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <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>
     </message>
@@ -5552,7 +5538,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation>Base de mana</translation>
     </message>
@@ -5706,610 +5692,590 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>depuis le jeu</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation> depuis son cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation> depuis l&apos;exil</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation> depuis sa main</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <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="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <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="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <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="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <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="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <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="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>depuis sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation>depuis sa réserve</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation>depuis la pile</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <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="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <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="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <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="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <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="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <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="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <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="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <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="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <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="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 détruit %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>une carte</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="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>%1 exile %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 joue %2%3.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation>dessous</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation>dessus</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <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="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <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="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <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="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>La partie commence.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <source>You are flooding the game. Please wait a couple of seconds.</source>
         <translation>Vous floodez la partie. Veuillez patienter quelques secondes.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <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="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <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="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <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="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <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="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <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="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 révèle %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <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="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <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="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>inversé</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>Face</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>Pile</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>Tour de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <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>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <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>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <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="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <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="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <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="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 engage ses permanents.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <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="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 engage %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 dégage %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 mélange %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 détache %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <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="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 annule sa dernière pioche (%2).</translation>
     </message>
@@ -6317,110 +6283,110 @@ 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="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>Mot1 Mot2 Mot3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>Ajouter un message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>Éditer le message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation>Supprimer le message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Ajouter message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Message :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>Éditer le message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>Paramètres du chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <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="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <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="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <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="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <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="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <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="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>Inverser la couleur du texte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <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="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <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="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <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="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(La couleur est hexadécimale)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <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>
@@ -6433,37 +6399,32 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
         <translation>Déplacer vers</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <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="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation>X cartes du dessus de la bibliothèque...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <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="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation>&amp;Main</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exil</translation>
     </message>
@@ -6605,57 +6566,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="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Étape de dégagement</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Étape d&apos;entretien</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Étape de pioche</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>Première phase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Étape de début de combat</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Étape de déclaration des attaquants</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Étape de déclaration des bloqueurs</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <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="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Étape de fin de combat</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>Seconde phase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Phase de fin de tour</translation>
     </message>
@@ -6672,138 +6633,134 @@ 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="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation>Voir les cartes du dessus de la bibliothèque</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Nombre de cartes : (max. %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation>Voir les cartes du dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation>Mélanger les cartes du dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation>Mélanger les cartes du dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation>Piocher une main</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation>0 et moins sont en comparaison avec la taille actuelle de la main</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation>Piocher des cartes</translation>
     </message>
-    <message>
-        <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="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"/>
+        <source>Move top cards to grave</source>
+        <translation>Mettre les cartes du dessus dans le cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
+        <translation>Exiler les cartes du dessus</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
+        <translation>Mettre les cartes du dessous dans le cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation>Exiler les cartes du dessous</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation>Piocher les cartes du dessous</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation>C&amp;réer un autre jeton %1</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation>Créer des jetons</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation>Nombre :</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation>Placer les X cartes depuis le dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation>Dans quelle position cette carte doit-elle être placée :</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation>(max. %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation>Changer la force/l&apos;endurance</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation>Changer les stats pour :</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation>Annoter</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation>Veuillez entrer la nouvelle annotation :</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation>Définir les marqueurs</translation>
     </message>
@@ -6811,65 +6768,48 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation>Joueur &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <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 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"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
+        <translation>D&amp;ire</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation>Préférence</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation>Épingler Imprimer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <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="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation>Afficher les cartes associées</translation>
     </message>
@@ -6918,25 +6858,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation>Date de Sortie</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation>Descendant</translation>
     </message>
     <message>
-        <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="49"/>
         <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>PtMenu</name>
     <message>
@@ -7075,33 +7007,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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 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>
@@ -7250,37 +7155,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</source>
         <translation>&amp;Voir la zone d&apos;exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;Move exile to...</source>
         <translation>&amp;Déplacer la zone d&apos;exil vers...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation>&amp;Main</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cimetière</translation>
     </message>
@@ -7323,14 +7228,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>Parties</translation>
     </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>
@@ -7395,53 +7292,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <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="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <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="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>Section :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>Action :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>Raccourci :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <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="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation>Effacer tous les raccourcis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation>Rechercher par nom de raccourci</translation>
     </message>
@@ -7509,27 +7406,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>Activer les &amp;sons</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>Thème sonore actuel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation>Tester les effets sonores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>Paramètres de son</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>Volume principal</translation>
     </message>
@@ -7745,123 +7642,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7869,52 +7702,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>Infos de la carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>Bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>Filtres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;Voir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation>Imprimer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>Flottant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>Réinitialiser l&apos;interface</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Deck : %1</translation>
     </message>
@@ -7922,55 +7763,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <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="300"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="306"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation>Filtres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation>Imprimer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation>Flottant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation>Réinitialiser l&apos;interface</translation>
     </message>
@@ -8035,7 +7882,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>Nouveau dossier</translation>
     </message>
@@ -8117,18 +7964,18 @@ Veuillez entrer un nom:</translation>
         <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="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation>Supprimer les decks dinstants</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Nom du nouveau dossier :</translation>
     </message>
@@ -8146,12 +7993,12 @@ Veuillez entrer un nom:</translation>
         <translation>Stockage visuel de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation>N&apos;a pas pu ouvrir le deck à %1</translation>
     </message>
@@ -8200,191 +8047,197 @@ Veuillez entrer un nom:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>Replay</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>Partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>Liste des joueurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>Infos de la carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</source>
         <translation>Messages</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>Historique des replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>&amp;Phases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>&amp;Partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Étape &amp;suivante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <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="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>Next &amp;turn</source>
         <translation>&amp;Tour suivant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="303"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <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="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="309"/>
         <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="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="312"/>
         <source>Game &amp;information</source>
         <translation>&amp;Informations sur la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
         <source>Un&amp;concede</source>
         <translation>Annuler la &amp;concession</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Concéder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Quitter la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>Fermer &amp;le replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Focus sur le chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;Dire :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</source>
         <translation>Cartes sélectionnées</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="338"/>
         <source>&amp;View</source>
         <translation>&amp;Voir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>Flottant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>Réinitialiser l&apos;interface</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Concéder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>Rester dans la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Quitter la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <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="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <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="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>Vous avez été expulsé de la partie.</translation>
     </message>
@@ -9486,152 +9339,142 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <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="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <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="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>Paramètres des notifications</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <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="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Paramètres des animations</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <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="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <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="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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="979"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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="980"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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="982"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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="984"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation>ne rien faire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <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="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <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="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <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="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation>Éditeur de deck classique</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation>Éditeur de deck visuel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation>Paramètres du replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Temps de tampon pour les sauts en arrière via un raccourci :</translation>
     </message>
@@ -9695,25 +9538,24 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
-        <translation type="unfinished"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
+        <translation>Mode : correspondance exacte</translation>
     </message>
     <message>
         <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"/>
+        <source>Mode: Includes</source>
+        <translation>Mode : inclure</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <source>Mode: Include/Exclude</source>
+        <translation>Mode : inclure / exclure</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation>Mode de filtre (conjonctions AND/OR/NOT de filtres)</translation>
     </message>
 </context>
 <context>
@@ -9739,108 +9581,25 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
         <translation>Entrer le nom du fichier...</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"/>
-    </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9848,32 +9607,22 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation>Mode : inclure</translation>
     </message>
@@ -9909,7 +9658,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation>Filtrer par extensions récentes</translation>
     </message>
@@ -9917,19 +9666,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation>Mode : inclure</translation>
     </message>
@@ -9937,37 +9686,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation>Mode : inclure</translation>
     </message>
@@ -9981,22 +9720,52 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <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="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <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="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation>Sauvegarder et charger des filtres</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <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_widget.cpp" line="275"/>
+        <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_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation>Filtrer par extension</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -10004,64 +9773,56 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation>Taille de l&apos;exemple de main</translation>
     </message>
@@ -10069,17 +9830,17 @@ 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="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10095,52 +9856,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <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="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation>Chemin de fichier</translation>
     </message>
@@ -10241,133 +9997,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <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="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <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="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <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="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <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="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation>Ordre par défaut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <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="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>Activer toutes les éditions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <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="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <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="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>Éditeur de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>Images des cartes</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="135"/>
         <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="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>Astuces</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>Gérer les éditions</translation>
     </message>
@@ -10375,72 +10131,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <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="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</source>
         <translation>Non groupé</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Group by Type</source>
         <translation>Grouper par Types</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <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="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Color</source>
         <translation>Grouper par Couleurs</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</source>
         <translation>Non trié</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Sort by Name</source>
         <translation>Trier par Nom</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Type</source>
         <translation>Trier par Type</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <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="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation>Trier par Couleurs</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation>Trier par F/E</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation>Trier par extension</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>mélanger en quittant</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>vue de la pile</translation>
     </message>
@@ -10475,7 +10231,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>Éditeur de deck</translation>
     </message>
@@ -10556,7 +10312,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation>Replays</translation>
     </message>
@@ -10708,7 +10464,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>Réinitialiser l&apos;interface</translation>
     </message>
@@ -11129,9 +10885,8 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <source>Toggle Untap</source>
+        <translation>Activer / désactiver le dégagement normal</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11150,102 +10905,98 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     </message>
     <message>
         <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>Attacher la carte…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>Détacher la carte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>Cloner la carte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>Créer un jeton…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>Créer tous les jetons associés</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>Créer un autre jeton</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>Annoter…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation>Sélectionne toutes les cartes dans la zone</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation>Sélectionne toutes les cartes dans la ligne</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation>Sélectionne toutes les cartes dans la colonne</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>Dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Exil</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Cimetière</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Main</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>Dessus de la bibliothèque</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>Champ de bataille, face cachée</translation>
     </message>
@@ -11281,246 +11032,234 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>Pile</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation>Cimetière (plusieurs)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation>Exil (plusieurs)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation>Empiler jusqu&apos;à ce que trouvé</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation>Piocher la carte du dessous </translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Piocher plusieurs cartes du dessous...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>Tracer une flèche…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation>Retirer les flèches locales</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>Quitter la partie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Concéder</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>Lancer un dé…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>Mélanger la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation>Mélanger les cartes du dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation>Mélanger les cartes du dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>Piocher une carte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>Piocher plusieurs cartes…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>Annuler la dernière pioche</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>Toujours révéler la carte du dessus</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>Toujours révéler la carte du dessus</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>Pivoter la vue dans le sens horaire</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Pivoter la vue dans le sens anti-horaire</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>Lâcher le focus de la boîte de texte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>Focus sur le chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>Effacer le chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>Rafraichir</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation>Avance en avant</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation>Avant en arrière</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation>Avance beaucoup en avant</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation>Avance beaucoup en arrière</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation>Jouer/Pause</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation>Activer l&apos;avance rapide</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation>Accueil</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation>Stockage visuel de deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation>Stockage de deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation>Journaux</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_it.ts b/cockatrice/translations/cockatrice_it.ts
index 3990d532f..a0765fbfb 100644
--- a/cockatrice/translations/cockatrice_it.ts
+++ b/cockatrice/translations/cockatrice_it.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Ricarica</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Acquisisci set e numero (se disponibili)</translation>
     </message>
@@ -36,62 +36,62 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <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="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation>Sei sicuro?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation>Salva mazzo</translation>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation>Non ci sono carte da esportare nel tuo mazzo</translation>
     </message>
@@ -101,7 +101,7 @@ Controlla se la cartella è valida e prova ancora.</translation>
     <message>
         <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -133,168 +133,190 @@ Controlla se la cartella è valida e prova ancora.</translation>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation> secondi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Impostazioni temi</translation>
     </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>Current theme:</source>
         <translation>Tema attuale:</translation>
     </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>Open themes folder</source>
         <translation>Apri cartella temi</translation>
     </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>Home tab background source:</source>
         <translation>Sorgente dello sfondo della Home:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <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="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation>Disattivato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <source>Display card name of background in bottom right:</source>
-        <translation>Mostra nome della carta di sfondo in basso a destra</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation>Impostazioni menù</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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="734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <source>Show game filter toolbar above list in room tab</source>
-        <translation>Mostra barra di filtro sopra la lista delle partite</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Visualizzazione delle carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <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="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <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="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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="748"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation> file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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="752"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation>Segnalini della carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</source>
         <translation>Segnalino %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
         <source>Hand layout</source>
         <translation>Disposizione della mano</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>Allinea a sinistra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Disposizione delle aree di gioco</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Inverti disposizione verticale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Dimensione massima carattere per le informazioni mostrate sulle carte:</translation>
     </message>
@@ -302,14 +324,9 @@ Controlla se la cartella è valida e prova ancora.</translation>
 <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>Torna ai risultati</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
-        <translation>Apri mazzo nell&apos;editor dei mazzi</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -533,7 +550,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
         <source>Name (Exact)</source>
-        <translation>Nome (esatto)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
@@ -627,22 +644,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation>Guarda carte correlate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <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="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation>Mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -657,12 +674,12 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Set:</source>
-        <translation>Set:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
         <source>Collector Number:</source>
-        <translation>Numero di collezione:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
@@ -678,124 +695,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation>Ri&amp;vela a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation>&amp;Tutti i giocatori</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation>Guarda carte correlate</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation>Pedina: </translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</source>
         <translation>Tutte le pedine</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="439"/>
         <source>&amp;Select All</source>
         <translation>&amp;Seleziona tutto</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="440"/>
         <source>S&amp;elect Row</source>
         <translation>S&amp;eleziona fila</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation>S&amp;eleziona colonna</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation>&amp;Gioca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation>&amp;Nascondi</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <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="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
-        <translation>Salta lo &amp;STAP</translation>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Blocca/Sblocca &amp;STAP normale</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <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="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation>&amp;Copia</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <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="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation>Tog&amp;li</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation>&amp;Disegna una freccia...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation>&amp;Imposta note...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <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="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation>&amp;Aggiungi segnalino (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Rimuovi segnalino (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>Imposta &amp;segnalini (%1)...</translation>
     </message>
@@ -805,139 +822,139 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
-        <translation>Dimensioni carte</translation>
+        <translation>Dimensioni della carta</translation>
     </message>
 </context>
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <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="187"/>
+        <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="189"/>
         <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="190"/>
-        <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="192"/>
-        <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="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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="203"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <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="204"/>
         <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="206"/>
-        <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="207"/>
-        <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="212"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>la zona personalizzata &apos;%2&apos; di %1</translation>
@@ -978,36 +995,36 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
         <source>Add Panel</source>
-        <translation>Aggiungi pannello</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
         <source>Remove Panel</source>
-        <translation>Rimuovi pannello</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
         <source>Save Layout</source>
-        <translation>Salva disposizione</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
         <source>Load Layout</source>
-        <translation>Carica disposizione</translation>
+        <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
-        <translation>Database carte</translation>
+        <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="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Info carta</translation>
     </message>
@@ -1030,32 +1047,32 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
         <translation>Aggiungi alla sideboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation>Seleziona stampa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <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="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Aggiungi carta alla &amp;sideboard</translation>
     </message>
@@ -1063,32 +1080,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
-        <translation>Caricamento database...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation>Carta copertina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <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="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation>Seleziona stampa</translation>
     </message>
@@ -1130,7 +1147,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <message>
         <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Format:</source>
-        <translation>Formato:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
@@ -1161,17 +1178,17 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation>Filtri</translation>
     </message>
     <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="140"/>
         <source>&amp;Clear all filters</source>
         <translation>&amp;Elimina tutti i filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation>Elimina filtro</translation>
     </message>
@@ -1294,7 +1311,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation>Selettore di stampa</translation>
     </message>
@@ -1302,166 +1319,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Aggiorna Spoiler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Fatto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <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="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <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="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>Aggiungi indirizzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>Indirizzo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>Modifica indirizzo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation>Dimensione cache di rete:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation>TTL cache dei reindirizzamenti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation>Dimensione cache immagini:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>Aggiungi indirizzo URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>Elimina indirizzo URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>Giorno/i</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Aggiornando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Scegli il percorso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>Ordine di priorità degli indirizzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>Spoiler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>Scarica spoiler automaticamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>Indirizzo spoiler:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Ultima modifica</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <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="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <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="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <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="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>Elimina immagini scaricate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>Resetta indirizzi di download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation>Cache su disco immagini scaricate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>Cache in memoria per immagini non attualmente su schermo</translation>
     </message>
@@ -1469,60 +1486,60 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
-        <translation>Annulla</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Redo</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>Ripeti</translation>
+        <source>Undo/Redo history</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>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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
-        <translation>[ripeti]</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
-        <translation>[annulla]</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation>Quantità</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Numero</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation>ID Provider</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Carta</translation>
     </message>
@@ -1530,12 +1547,12 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation>Formati di mazzo comuni (%1)</translation>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation>Tutti i file (*.*)</translation>
     </message>
@@ -1632,94 +1649,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <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="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <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="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <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="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation>Con annotazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <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="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <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="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <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="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <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="488"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <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="415"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation>Eliminazione non riuscita</translation>
     </message>
@@ -1729,57 +1746,57 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     <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>
+        <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>Commenti aggiornati (prima %1 caratteri, ora %2 caratteri)</translation>
+        <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>Impostata carta copertina a %1 (%2)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
         <source>Tags changed</source>
-        <translation>Etichette modificate</translation>
+        <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>Formato impostato a %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <source>Added (%1): %2 (%3) %4</source>
-        <translation>Aggiunto (%1): %2 (%3) %4</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation>Spostato in %1 1 × &quot;%2&quot; (%3)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation>Rimosso &quot;%1&quot; (tutte le copie)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation>%1 1 × &quot;%2&quot; (%3)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
-        <translation>Aggiunto</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
-        <translation>Rimosso</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1844,30 +1861,30 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
         <translation>Sideboard bloccata</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <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="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -2133,7 +2150,7 @@ Vuoi convertire il mazzo al formato .cod?</translation>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
         <source>Create game as judge</source>
-        <translation>Crea partita come arbitro</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
@@ -2362,17 +2379,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <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="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation>Lista del mazzo non valida.</translation>
     </message>
@@ -2509,7 +2526,7 @@ Per rimuovere il tuo avatar attuale, conferma senza scegliere una nuova immagine
         <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;Gestisci Espansioni&quot; per visualizzarle correttamente.</translation>
+Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Organizza set&quot; per visualizzarle correttamente.</translation>
     </message>
 </context>
 <context>
@@ -2601,7 +2618,7 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Gestisci
         <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
         <source>Hide games not created by buddies</source>
         <oldsource>Hide games not created by buddy</oldsource>
-        <translation>Nascondi partite non create dagli amici</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
@@ -2873,17 +2890,17 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Gestisci
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Lista del mazzo non valida.</translation>
     </message>
@@ -2891,45 +2908,45 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Gestisci
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <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="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <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="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
         <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="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2954,73 +2971,40 @@ https://tappedout.net/mtg-decks/nome-del-tuo-mazzo/</translation>
         <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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <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="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation>Numero di risultati:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <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="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>Filtro non valido</translation>
     </message>
@@ -3166,28 +3150,28 @@ La tua email verrà utilizzata per verificare il tuo account.</translation>
     <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>
+        <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>Informazioni sulle stampe eliminate.</translation>
+        <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>Imposta tutte le stampe come preferite.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3204,7 +3188,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3221,7 +3205,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3233,7 +3217,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3242,7 +3226,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3251,7 +3235,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3264,59 +3248,59 @@ 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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Aspetto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Interfaccia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>Immagini carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Suoni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Scorciatoie</translation>
     </message>
@@ -3572,131 +3556,131 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <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>
+        <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>Criterio:</translation>
+        <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>Nome carta</translation>
+        <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>Tipo</translation>
+        <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>Sottotipo</translation>
+        <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>Valore di mana</translation>
+        <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>Precisione:</translation>
+        <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>Almeno</translation>
+        <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>Esattamente</translation>
+        <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>Quantità (N):</translation>
+        <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>Carte pescate (M):</translation>
+        <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>carte</translation>
+        <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"/>
+        <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>
+        <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>Probability of drawing</source>
-        <translation>Probabilità di pescare</translation>
+        <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>Card Name</source>
-        <translation>Nome carta</translation>
+        <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>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation>Sottotipo</translation>
+        <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>Mana Value</source>
-        <translation>Valore di mana</translation>
+        <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="109"/>
-        <source>At least</source>
-        <translation>Almeno</translation>
+        <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>Exactly</source>
-        <translation>Esattamente</translation>
+        <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="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation>carta/e avendo pescato almeno</translation>
+        <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>cards</source>
-        <translation>carte</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
         <source>Category</source>
-        <translation>Categoria</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Qty</source>
-        <translation>Quantità</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
-        <translation>Probabilità (%)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3773,7 +3757,7 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <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>Carte decisive</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3781,7 +3765,7 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3932,12 +3916,12 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
         <source>Join Game as Judge</source>
-        <translation>Unisciti a una partita come arbitro</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
         <source>Spectate Game as Judge</source>
-        <translation>Osserva partita come arbitro</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
@@ -3977,7 +3961,7 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>Join as judge</source>
-        <translation>Unisciti come arbitro</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
@@ -3987,7 +3971,7 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
         <source>Join as judge spectator</source>
-        <translation>Unisciti come arbitro spettatore</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
@@ -4005,32 +3989,32 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     <message>
         <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
         <source>All types</source>
-        <translation>Tutti i tipi</translation>
+        <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>Filtra per nome della partita...</translation>
+        <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>Filtra per tipo / formato di partita</translation>
+        <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>Nascondi le partite non create da amici</translation>
+        <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>Nascondi partite al completo</translation>
+        <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>Nascondi partite iniziate</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4142,143 +4126,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Seleziona il percorso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Impostazioni personali</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Lingua:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>Percorsi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation>giorni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation>Ultimo controllo %1 (%2 giorni fa)</translation>
     </message>
@@ -4286,47 +4270,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/player/menu/grave_menu.cpp" line="97"/>
         <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/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <source>&amp;All players</source>
-        <translation>&amp;Tutti i giocatori</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
         <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/player/menu/grave_menu.cpp" line="106"/>
         <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/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation>Rivela carta casuale a...</translation>
     </message>
@@ -4334,88 +4318,88 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation>&amp;Vedi mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
-        <translation>Ordina mano per...</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation>Nome</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation>Valore di mana</translation>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
+        <source>Take &amp;mulligan (Choose hand size)</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>Effettua un &amp;mulligan (Scegli numero di carte)</translation>
+        <source>Take mulligan (Same 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>Effettua un mulligan (Stessa dimensione della mano)</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
         <source>Take mulligan (Hand size - 1)</source>
-        <translation>Effettua un mulligan (Dimensione della mano - 1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation>&amp;Sposta mano in...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Cima al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Fondo al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cimitero</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation>&amp;Esilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation>&amp;Rivela mano a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
-        <translation>Tutti i giocatori</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation>Rivela carta c&amp;asuale a...</translation>
     </message>
@@ -4423,52 +4407,52 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation>Crea un nuovo mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation>Esplora i mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation>Esplora il database delle carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation>Esplora EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
-        <translation>Esplora Archidekt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation>Guarda i replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation>Connessione in corso...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation>Connetti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation>Gioca</translation>
     </message>
@@ -4476,215 +4460,195 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</source>
         <translation>&amp;Grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
         <source>&amp;View library</source>
         <translation>&amp;Guarda il grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <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="213"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
         <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="214"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
         <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="215"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
         <source>Lend library to...</source>
         <translation>Presta il grimorio a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
         <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="217"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
         <source>&amp;Top of library...</source>
-        <translation>&amp;Dalla cima del grimorio...</translation>
+        <translation>&amp;In cima al grimorio...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
         <source>&amp;Bottom of library...</source>
-        <translation>&amp;Dal fondo del grimorio...</translation>
+        <translation>&amp;In fondo al grimorio...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
         <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="220"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
         <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="221"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
         <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="223"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
         <source>&amp;Draw card</source>
         <translation>&amp;Pesca una carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
         <source>D&amp;raw cards...</source>
         <translation>P&amp;esca carte...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
         <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="227"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
         <source>Shuffle</source>
         <translation>Mescola</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
         <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="230"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
         <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="231"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
         <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="232"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
         <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="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <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="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <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="235"/>
-        <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/player/menu/library_menu.cpp" line="236"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <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="237"/>
-        <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/player/menu/library_menu.cpp" line="238"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <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="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation>Mescola le carte in cima...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <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="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <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="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <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="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <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="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <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="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <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="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <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="248"/>
-        <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/player/menu/library_menu.cpp" line="249"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <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="250"/>
-        <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/player/menu/library_menu.cpp" line="251"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <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="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation>Mescola le carte in fondo...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
-        <translation>&amp;Tutti i giocatori</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
-        <translation>Rivela le carte in cima al grimorio</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
-        <translation>Numero di carte: (max. %1)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4782,8 +4746,18 @@ Will now login.</source>
 Login in corso.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Numero di giocatori</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <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="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Giocatore %1</translation>
     </message>
@@ -4886,8 +4860,8 @@ Login in corso.</translation>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
@@ -5212,7 +5186,7 @@ La tua versione è la %1, la versione online è la %2.</translation>
     <message>
         <location filename="src/interface/window_main.cpp" line="678"/>
         <source>&amp;Manage sets...</source>
-        <translation>&amp;Gestisci Espansioni...</translation>
+        <translation>&amp;Organizza set...</translation>
     </message>
     <message>
         <location filename="src/interface/window_main.cpp" line="679"/>
@@ -5295,36 +5269,36 @@ La tua versione è la %1, la versione online è la %2.</translation>
         <translation>Mostra/Nascondi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>Nuova versione</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice installata</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>Database carte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5333,29 +5307,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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Apri impostazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>Nuovi set trovati</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5368,84 +5342,84 @@ Codici dei set: %1
 Desideri attivarli?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>Vedi set</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Benvenuto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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;Gestisci Espansioni&quot;.</translation>
+Scopri metodi alternativi per visualizzare i set o disabilitare set ed effetti nella finestra &quot;Organizza set&quot;.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Informazione</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <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="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <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="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation>Aggiornamento delle carte in corso.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <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="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation>Si è verificato un errore sconosciuto.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <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="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5456,55 +5430,55 @@ Solitamente non si dovrebbe incorrere in problemi, ma questo messaggio può sign
 Per aggiornare il tuo client, vai su Aiuto -&gt; Controlla aggiornamenti client</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Carica set di carte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <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="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <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="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Il nuovo set di carte non è stato importato a causa di un errore.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation>Reimposta Password</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <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>
     </message>
@@ -5514,48 +5488,48 @@ Il database delle carte verrà ricaricato.</translation>
     <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>Configurazione Base di mana</translation>
+        <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>Modalità di visualizzazione:</translation>
+        <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>a torta</translation>
+        <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>a barre</translation>
+        <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>a barre combinate</translation>
+        <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>Filtra per colori (opzionale):</translation>
+        <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>OK</translation>
+        <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>Annulla</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation>Base di mana</translation>
     </message>
@@ -5565,47 +5539,47 @@ Il database delle carte verrà ricaricato.</translation>
     <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>
+        <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>
+        <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>colore</translation>
+        <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>sottotipo</translation>
+        <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>forza</translation>
+        <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>costituzione</translation>
+        <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>Filtri (opzionali):</translation>
+        <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>Mostra il grafico principale</translation>
+        <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>Mostra i grafici per categorie</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5621,27 +5595,27 @@ Il database delle carte verrà ricaricato.</translation>
     <message>
         <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
         <source>Display type:</source>
-        <translation>Modalità di visualizzazione:</translation>
+        <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>A torta</translation>
+        <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>A barre</translation>
+        <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>A barra combinata</translation>
+        <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>Filtri per colore (opzionali):</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5657,27 +5631,27 @@ Il database delle carte verrà ricaricato.</translation>
     <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>
+        <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>A torta</translation>
+        <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>A barre</translation>
+        <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>Colori:</translation>
+        <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>Mostra grafici per colore</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5685,12 +5659,12 @@ Il database delle carte verrà ricaricato.</translation>
     <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>
+        <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 carte)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5698,621 +5672,601 @@ Il database delle carte verrà ricaricato.</translation>
     <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>
+        <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>Impostazioni distribuzione di mana</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation> dal campo di battaglia</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation> dal suo cimitero</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation> dall&apos;esilio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation> dalla sua mano</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <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="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <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="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <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="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <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="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <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="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation> dal suo grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation> dalla sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation> dalla pila</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <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="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <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="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <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="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <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="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <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="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <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="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <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="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <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="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 distrugge %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>una carta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="311"/>
-        <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/log/message_log_widget.cpp" line="313"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="317"/>
-        <source>%1 exiles %2%3 face down.</source>
-        <translation>%1 esilia %2%3 a faccia in giù.</translation>
-    </message>
     <message>
         <location filename="src/game/log/message_log_widget.cpp" line="319"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 esilia %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation>%1 gioca %2%3 a faccia in giù.</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 gioca %2%3.</translation>
     </message>
     <message>
-        <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>%1 mette %2 nella zona personalizzata &apos;%4&apos;%3 a faccia in giù.</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="349"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation>in fondo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation>in cima</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <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="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <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="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <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="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>La partita è iniziata.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <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="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <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="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <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="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <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="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <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="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 rivela %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <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="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 rivela %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>invertito</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>normale</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>Testa</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>Croce</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>Turno di %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <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>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <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>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <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="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <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="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <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="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <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="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 TAPpa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 STAPpa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 mescola %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 toglie %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <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="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 annulla la sua ultima pescata (%2).</translation>
     </message>
@@ -6320,110 +6274,110 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>Parola1 Parola2 Parola3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>Aggiungi Nuovo Messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>Modifica Messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation>Rimuovi Messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Aggiungi messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Messaggio:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>Modifica messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>Impostazioni chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>Lista parole evidenziate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>Abilita menzioni in chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>Abilita completamento menzioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation>Messaggi rapidi in partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <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="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>Inverti colore testo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <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="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <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="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <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="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(Colore in esadecimale)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separare le parole con uno spazio; solo caratteri alfanumerici</translation>
     </message>
@@ -6436,37 +6390,32 @@ Il database delle carte verrà ricaricato.</translation>
         <translation>&amp;Metti in</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
-        <translation>&amp;Cima al grimorio in ordine casuale</translation>
+        <translation>&amp;In cima al grimorio in ordine casuale</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <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="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
-        <translation>&amp;Fondo al grimorio in ordine casuale</translation>
+        <translation>In &amp;fondo al grimorio in ordine casuale</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation>Tavolo</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cimitero</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation>&amp;Esilio</translation>
     </message>
@@ -6608,57 +6557,57 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Sottofase di STAP</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Sottofase di mantenimento</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Sottofase di acquisizione</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>Prima fase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Sottofase di inizio combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Sottofase di dichiarazione degli attaccanti</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Sottofase di dichiarazione dei bloccanti</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Sottofase del danno da combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Sottofase di fine combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>Seconda fase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Sottofase finale</translation>
     </message>
@@ -6675,138 +6624,134 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation>Guarda le carte in cima al grimorio</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Numero di carte: (max %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation>Guarda le carte in fondo al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation>Mescola le carte in cima al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation>Mescola le carte in fondo al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation>Pesca mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation>Pesca carte</translation>
     </message>
-    <message>
-        <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>cimitero</translation>
-    </message>
     <message>
         <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>esilio</translation>
+        <source>Move top cards to grave</source>
+        <translation>Metti le prime carte nel cimitero</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
+        <translation>Esilia le prime carte</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <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="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation>Esilia le ultime carte</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation>Pesca le ultime carte</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <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="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation>Crea pedine</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation>Numero:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation>Metti la carta in posizione X dalla cima del grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation>In che posizione dovrebbe essere messa questa carta:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation>(max %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation>Cambia forza/costituzione</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation>Cambia valori a:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation>Imposta note</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation>Inserisci le nuove note:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation>Imposta i segnalini</translation>
     </message>
@@ -6814,68 +6759,48 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation>Giocatore &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation>&amp;Contatori</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>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>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
+        <translation>Invi&amp;a</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <source>Display Navigation Buttons</source>
         <translation>Visualizza pulsanti di navigazione</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="155"/>
-        <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation>Preferenza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <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="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <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="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation>Mostra carte correlate</translation>
     </message>
@@ -6924,25 +6849,17 @@ Questo significa che vedrai solo la stampa predefinita per ciascuna scarta anzic
         <translation>Data di rilascio</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation>Discendente</translation>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7081,45 +6998,6 @@ Questo significa che vedrai solo la stampa predefinita per ciascuna scarta anzic
         <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>
@@ -7268,37 +7146,37 @@ Sicuro di voler disabilitare questa funzione?</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation>&amp;Esilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <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="65"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;Move exile to...</source>
         <translation>&amp;Muovi esilio in...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Cima al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Fondo al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cimitero</translation>
     </message>
@@ -7341,14 +7219,6 @@ Sicuro di voler disabilitare questa funzione?</translation>
         <translation>Partite</translation>
     </message>
 </context>
-<context>
-    <name>SayMenu</name>
-    <message>
-        <location filename="src/game/player/menu/say_menu.cpp" line="16"/>
-        <source>S&amp;ay</source>
-        <translation>Invi&amp;a</translation>
-    </message>
-</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -7413,53 +7283,53 @@ Sicuro di voler disabilitare questa funzione?</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation>Ripristina scorciatoie predefinite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <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="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>Sezione:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>Azione:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>Scorciatoia:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <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="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation>Elimina tutte le scorciatoie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation>Cerca per nome della scorciatoia</translation>
     </message>
@@ -7528,27 +7398,27 @@ Controlla le impostazioni!</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>Abilita &amp;suoni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>Tema sonoro attuale:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <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="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>Impostazioni suoni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>Volume</translation>
     </message>
@@ -7764,176 +7634,120 @@ Controlla le impostazioni!</translation>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <source>Desc.</source>
-        <translation>Decresc.</translation>
+        <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>AND</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
+        <source>Asc.</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>Richiede TUTTI i colori selezionati</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</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>Nome mazzo...</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</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>Proprietario...</translation>
-    </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>Package</translation>
-    </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>Filtri avanzati</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation>Fascia:</translation>
+        <source>Disabled</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>Qualsiasi</translation>
-    </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>Contiene carta...</translation>
-    </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>Comandante...</translation>
-    </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>Tag...</translation>
-    </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>Dimensione mazzo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation>Carte:</translation>
-    </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>Cresc.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation>Ordina per:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation>Filtra per:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation>Impostazioni di visualizzazione</translation>
-    </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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <source>Search</source>
-        <translation>Cerca</translation>
+        <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
-        <translation>Formati</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
-        <translation>Archidekt: </translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>Info carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>Mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>Filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
-        <translation>Database carte</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation>Stampa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>Separata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>Reimposta disposizione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Mazzo: %1</translation>
     </message>
@@ -7941,55 +7755,61 @@ Controlla le impostazioni!</translation>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <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="300"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="306"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation>Mazzo</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation>Filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation>Stampa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation>Separata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation>Reimposta disposizione</translation>
     </message>
@@ -7999,12 +7819,12 @@ Controlla le impostazioni!</translation>
     <message>
         <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
         <source>Visual Deck View</source>
-        <translation>Mazzo visuale</translation>
+        <translation>Galleria mazzo</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
         <source>Visual Database Display</source>
-        <translation>Database visuale</translation>
+        <translation>Galleria database</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
@@ -8054,7 +7874,7 @@ Controlla le impostazioni!</translation>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>Nuova cartella</translation>
     </message>
@@ -8135,18 +7955,18 @@ Please enter a name:</source>
         <translation>Vuoi davvero eliminare i file selezionati?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation>Elimina i deck remoti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Nome della nuova cartella:</translation>
     </message>
@@ -8164,12 +7984,12 @@ Please enter a name:</source>
         <translation>Galleria mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation>Impossibile aprire il mazzo a %1</translation>
     </message>
@@ -8218,191 +8038,197 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>Replay</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>Partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>Giocatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>Info carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</source>
         <translation>Messaggi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>&amp;Fasi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>&amp;Partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Prossima &amp;fase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <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="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>Next &amp;turn</source>
         <translation>Prossimo &amp;turno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="303"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <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="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="309"/>
         <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="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="312"/>
         <source>Game &amp;information</source>
         <translation>&amp;Informazioni partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
         <source>Un&amp;concede</source>
         <translation>Rientra in gioco</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Concedi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Lascia partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>C&amp;hiudi replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</source>
         <translation>Vai alla &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;Parla:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</source>
         <translation>Carte selezionate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="338"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>Separata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>Reimposta disposizione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Concedi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>Annulla concedi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Lascia la partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <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="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <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="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>Sei stato kickato fuori dalla partita.</translation>
     </message>
@@ -8903,7 +8729,7 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
         <source>Archidekt</source>
-        <translation>Archidekt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
@@ -9031,7 +8857,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
         <source>Database Display</source>
-        <translation>Visualizzazione Database</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
@@ -9505,152 +9331,142 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>Impostazioni generali di interfaccia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <source>Do not delete &amp;arrows inside of subphases</source>
-        <translation>Non eliminare le &amp;freccie al cambio di sottofase</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <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="968"/>
-        <source>Show selection counter during drag selection</source>
-        <translation>Mostra un contatore quando selezioni per trascinamento</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
-        <source>Show total selection counter</source>
-        <translation>Mostra un contatore di elementi selezionati</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>Impostazioni notifiche</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <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="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Impostazioni delle animazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>Animazioni &amp;TAPpa/STAPpa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation>Impostazioni editor/archivio mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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="979"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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="980"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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="982"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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="984"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation>non fare nulla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <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="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <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="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation>Editor dei mazzi predefinito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation>Editor classico</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation>Editor visuale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation>Impostazioni di riproduzione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Tempo di attesa per saltare indietro dopo aver premuto la scorciatoia</translation>
     </message>
@@ -9714,25 +9530,24 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
-        <translation>Include</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
+        <translation>Modalità: Corrispondenza esatta</translation>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
+        <translation>Modalità: Include</translation>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <source>Mode: Include/Exclude</source>
+        <translation>Modalità: Include/Esclude</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation>Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT)</translation>
     </message>
 </context>
 <context>
@@ -9740,7 +9555,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
@@ -9758,141 +9573,48 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
         <translation>Inserisci il nome del file...</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>Ordina per</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>Filtra per</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>Salva e carica filtri</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>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="147"/>
-        <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="148"/>
-        <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="149"/>
-        <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="150"/>
-        <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="152"/>
-        <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="153"/>
-        <source>Name</source>
-        <translation>Nome</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>Tipo</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>Sottotipo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation>Set</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <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="71"/>
-        <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="72"/>
-        <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="73"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation>Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Exact Match</source>
-        <translation>Modalità: Corrispondenza esatta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
-        <translation>Modalità: Include</translation>
+        <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="66"/>
-        <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="67"/>
-        <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="68"/>
+        <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>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation>Modalità: Include</translation>
     </message>
@@ -9902,7 +9624,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Filter by name... (Exact match)</source>
-        <translation>Filtra per nome... (Corrispondenza esatta)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
@@ -9928,7 +9650,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation>Filtra per i set più recenti</translation>
     </message>
@@ -9936,19 +9658,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation>Modalità: Include</translation>
     </message>
@@ -9956,37 +9678,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="71"/>
-        <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="72"/>
-        <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="73"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation>Modalità: Include</translation>
     </message>
@@ -10000,87 +9712,109 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
-        <translation>Visuale</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation>Caricamento database...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <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="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <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_widget.cpp" line="274"/>
+        <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_widget.cpp" line="275"/>
+        <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_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation>Filtra per set</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
-        <translation>Tabella</translation>
+        <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
-        <translation>Raggruppa per:</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
+        <source>Change how cards are divided into categories/groups.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <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="90"/>
-        <source>Change how cards are divided into categories/groups.</source>
-        <translation>Modifica come le carte sono divise in categorie / gruppi.</translation>
+        <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="91"/>
-        <source>Sort by:</source>
-        <translation>Ordina per:</translation>
-    </message>
-    <message>
-        <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>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
+        <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="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="121"/>
-        <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="96"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation>Dimensione della mano</translation>
     </message>
@@ -10088,17 +9822,17 @@ 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="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10114,52 +9848,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation>Percorso file</translation>
     </message>
@@ -10260,133 +9989,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <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="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <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="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <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="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <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="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation>Ordine predefinito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <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="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>Abilita tutti i set</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>Disabilita tutti i set</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <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="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>Editor dei mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>Immagine carta</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="135"/>
         <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="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>Suggerimenti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>Organizza set</translation>
     </message>
@@ -10394,72 +10123,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <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="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</source>
         <translation>Non raggruppare</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Group by Type</source>
         <translation>Raggruppa per tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <source>Group by Mana Value</source>
         <translation>Raggruppa per costo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Color</source>
         <translation>Raggruppa per colore</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</source>
         <translation>Non ordinato</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Sort by Name</source>
         <translation>Ordina per nome</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Type</source>
         <translation>Ordina per tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation>Ordina per costo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation>Ordina per colori</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation>Ordina per F/C</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation>Ordina per Set</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>Mescola alla chiusura</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>Raggruppa per tipo</translation>
     </message>
@@ -10494,7 +10223,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>Editor dei mazzi</translation>
     </message>
@@ -10575,7 +10304,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation>Replay</translation>
     </message>
@@ -10727,7 +10456,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>Reimposta Disposizione</translation>
     </message>
@@ -11148,9 +10877,8 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation>Salta lo STAP</translation>
+        <source>Toggle Untap</source>
+        <translation>Abilita STAPpa</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11169,102 +10897,98 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="516"/>
-        <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="519"/>
         <source>Attach Card...</source>
         <translation>Assegna Carta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>Togli Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>Clona Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>Crea Pedina...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>Crea Tutte le Pedine Correlate</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>Crea un&apos;Altra Pedina</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>Imposta Note...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation>Seleziona Tutte le Carte nella Zona</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation>Seleziona Tutte le Carte nella Riga</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation>Seleziona Tutte le Carte nella Colonna</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <source>Reveal Selected Cards to All Players</source>
-        <translation>Rivela Carta Selezionata a Tutti i Giocatori</translation>
+        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>Fondo al Grimorio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Esilio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Cimitero</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Mano</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>Cima al Grimorio</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>Campo di Battaglia, faccia in giù</translation>
     </message>
@@ -11300,246 +11024,234 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>Pila</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
-        <translation>Cimitero (Multiple)</translation>
+        <translation>Cimitero (multiplo)</translation>
     </message>
     <message>
-        <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>Cimitero (Multiple), a faccia in giù</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="607"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
-        <translation>Esilia (Multiple)</translation>
+        <translation>Esilia (multiplo)</translation>
     </message>
     <message>
-        <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>Esilio (Multiple), a faccia in giù</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation>Impila Fino a Trovare</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation>Pesca Carta in Fondo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Pesca Multiple Carte in Fondo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>Disegna Freccia...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation>Rimuovi Frecce Locali</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>Abbandona Partita</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Concedi</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>Tira un Dado...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>Mescola il Grimorio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation>Mescola Carte in Cima al Grimorio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation>Mescola Carte in Fondo al Grimorio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
-        <translation>Mulligan (Come la mano attuale)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
-        <translation>Mulligan (Dimensione della mano - 1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>Pesca una Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>Pesca più Carte...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>Annulla Pescata</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>Rivela Sempre la Carta in Cima</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>Guarda Sempre la Carta in Cima</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
-        <translation>Ordina mano per Nome</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
-        <translation>Ordina mano per Tipo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
-        <translation>Ordina mano per Valore di Mana</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
-        <translation>Rivela Mano a Tutti i Giocatori</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
-        <translation>Rivela Carta Casuale a Tutti i Giocatori</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>Ruota Vista in Senso Orario</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Ruota Vista in Senso Antiorario</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>Togli Focus dalla Casella di Testo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>Vai alla chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>Cancella chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>Aggiorna</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation>Salta Avanti</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation>Salta Indietro</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation>Salta Avanti di Molto</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation>Salta Indietro di Molto</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation>Riproduci/Pausa</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation>Attiva/Disattiva Avanzamento Rapido</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation>Home</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation>Galleria mazzi</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation>Archivio mazzi</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation>Amministrazione</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation>Registri</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_ja.ts b/cockatrice/translations/cockatrice_ja.ts
index a53588fc1..d10718a44 100644
--- a/cockatrice/translations/cockatrice_ja.ts
+++ b/cockatrice/translations/cockatrice_ja.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation>(&amp;R)更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>可能ならセット名と番号を解析する</translation>
     </message>
@@ -36,61 +36,61 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation>新しいタブで開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation>よろしいですか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -132,168 +132,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>テーマ設定</translation>
     </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>Current theme:</source>
         <translation>現在のテーマ</translation>
     </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>Open themes folder</source>
         <translation>テーマフォルダを開く</translation>
     </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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation>メニュー設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>右クリックメニューにキーボードショートカットを表示する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>カードの描画</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <source>Display card names on cards having a picture</source>
         <translation>画像のあるカードにカード名を表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>横向きレイアウトのカードを自動回転</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <source>Scale cards on mouse over</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="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <source>Maximum initial 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/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation>行</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>手札のレイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>手札を横に並べる</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>左揃えを有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>テーブルのレイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>カード配置の垂直反転</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>プレイヤーを複数列レイアウトにする最少人数:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>カードに表示する情報の最大のフォントサイズ:</translation>
     </message>
@@ -301,12 +323,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -626,22 +643,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation>関連カードを見る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation>デッキにカードを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation>メインボード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation>サイドボード</translation>
     </message>
@@ -677,124 +694,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</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="439"/>
         <source>&amp;Select All</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="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -810,133 +827,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -998,7 +1015,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1006,7 +1023,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1029,32 +1046,32 @@ 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/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1062,32 +1079,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1160,17 +1177,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="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1293,7 +1310,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1301,166 +1318,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>スポイラーを更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>完了</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation>ダウンロードURLをリセットしました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation>ダウンロードしたカード画像を削除しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>URLを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>URLを編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation>ネットワークキャッシュサイズ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation>リダイレクトキャッシュの有効期限:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation>画像キャッシュサイズ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>新しいURLを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>URLを削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>更新中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>パスを選ぶ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>ダウンロードURL優先設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>スポイラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>スポイラーを自動的にダウンロード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>スポイラーの保存場所:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>最新に更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <source>Spoilers download automatically on launch</source>
         <translation>スポイラーは起動時に自動的にダウンロードされます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <source>Press the button to manually update without relaunching</source>
         <translation>ボタンを押すと再起動せずに手動で更新します。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Download card pictures on the fly</source>
         <translation>カード画像を自動的にダウンロード（英語）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <source>How to add a custom URL</source>
         <translation>URLの追加方法について（英語）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>ダウンロードした画像を削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>ダウンロードURLをデフォルトに戻す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation>ダウンロードした画像のディスク上キャッシュ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>現在画面に表示されていない画像のメモリ内キャッシュ</translation>
     </message>
@@ -1468,32 +1485,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1501,27 +1518,27 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation>枚数</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation>セット</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>枚数</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation>プロバイダーID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>カード名</translation>
     </message>
@@ -1529,12 +1546,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1631,94 +1648,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1751,32 +1768,32 @@ 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/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1843,29 +1860,29 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation>サイドボードロック中</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <source>The selected file could not be loaded.</source>
         <translation>選択したファイルが開けませんでした。</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2360,17 +2377,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2871,17 +2888,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <source>Load deck from clipboard</source>
         <translation>クリップボードからデッキを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>無効なデッキリストです。</translation>
     </message>
@@ -2889,43 +2906,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2944,73 +2961,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation>カード名または検索条件:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation>枚数</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation>自動的にプレイ</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <source>Put top cards on stack until...</source>
         <translation>見つかるまで上からスタックに置く...</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation>悪魔からの助言</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>不正な条件</translation>
     </message>
@@ -3172,12 +3156,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <source>Unknown Error loading card database</source>
         <translation>カードデータベース読み込みの不明なエラー。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3194,7 +3178,7 @@ Oracle Importerでデータベースを更新する必要があります。
 データベースの場所の設定を変更してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3211,7 +3195,7 @@ Oracle Importerでデータベースを更新する必要があります。
 データベースの場所の設定を変更してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3224,7 +3208,7 @@ Would you like to change your database location setting?</source>
 データベースの場所の設定を変更しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3233,7 +3217,7 @@ Would you like to change your database location setting?</source>
 データベースの場所の設定を変更してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3242,7 +3226,7 @@ Would you like to change your database location setting?</source>
 データベースの場所の設定を変更してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3255,59 +3239,59 @@ Would you like to change your database location setting?</source>
 データベースの場所設定を変更しますか？</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</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="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>全般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>外観</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>UI</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>カードダウンロード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>チャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>サウンド</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>ショートカット</translation>
     </message>
@@ -3624,67 +3608,67 @@ You may have to manually download the new version.</translation>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4132,143 +4116,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>パスを選択</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>個人設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>言語:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>パス</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <source>Decks directory:</source>
         <translation>デッキフォルダ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <source>Replays directory:</source>
         <translation>リプレイフォルダ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
         <source>Pictures directory:</source>
         <translation>カード画像フォルダ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
         <source>Card database:</source>
         <translation>カードデータベース:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <source>Token database:</source>
         <translation>トークンデータベース:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
         <source>Update channel</source>
         <translation>更新チャンネル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4276,47 +4260,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4324,88 +4308,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4413,52 +4397,52 @@ You may have to manually download the new version.</translation>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4466,213 +4450,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4768,8 +4732,18 @@ Will now login.</source>
 ログインします。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>プレイヤー人数</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation>プレイヤーの人数を入れてください.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>プレイヤー %1</translation>
     </message>
@@ -4872,8 +4846,8 @@ Will now login.</source>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
@@ -5282,36 +5256,36 @@ Local version is %1, remote version is %2.</source>
         <translation>表示/非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>新しいバージョン</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Cockatriceがインストールされました</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>カードデータベース</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5320,29 +5294,29 @@ If unsure or first time user, choose &quot;Yes&quot;</source>
 よくわからない場合、初回起動時などは「はい」を押して下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>はい</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>いいえ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>設定を開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>新しいセットが見つかりました</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5351,17 +5325,17 @@ Do you want to enable it/them?</source>
 有効にしますか？</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>セットを見る</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>ようこそ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5370,64 +5344,64 @@ Read more about changing the set order or disabling specific sets and consequent
 「セットの設定」ウィンドウ内の特定のセットを無効にしたり、順序を変更をする方法の詳細をお読みください。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>情報</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <source>A card database update is already running.</source>
         <translation>データベース更新は既に起動中です。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <source>Unable to run the card database updater: </source>
         <translation>データベース更新が実行できませんでした:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5437,55 +5411,55 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 クライアントを更新するには、ヘルプ→クライアントの更新のチェックをクリックしてください。</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>セット/カードを読み込む</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation>選択したファイルが見つかりませんでした。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <source>You can only import XML databases at this time.</source>
         <translation>ここではXMLデータベースのみをインポートできます。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>セット/カードのインポートに失敗</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation>パスワードリセット</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
         <translation>パスワードをリセットしました。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
         <translation>パスワードをリセットできませんでした。サーバー管理者にリセットしてもらってください。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation>アクティベーションリクエストを受信しました。メールでアクティベーショントークンを確認してください。</translation>
     </message>
@@ -5536,7 +5510,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5690,610 +5664,590 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>スタックから</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation>墓地から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation>追放領域から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation>手札から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source>the top card of their library</source>
         <translation>ライブラリーの一番上のカード</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <source> from the top of their library</source>
         <translation>ライブラリーの一番上から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source>the bottom card of their library</source>
         <translation>ライブラリーの一番下のカード</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation>ライブラリーの一番下のカード</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s library</source>
         <translation>%1のライブラリーから</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>ライブラリーから</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation>サイドボードから</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation>スタックから</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 が投了した！！！</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1が投了を撤回した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 がゲームに再接続した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 はゲームから切断された。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 はトークン: %2 を%3作成した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 はデッキをロードした。ハッシュ:%2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 は %2 を取り除いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>カード</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="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>%1 は %2 を%3追放した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 は %2 を%3プレイした。</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation>下から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation>上から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 は %2 を裏向きにした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 は %2 を表向きにした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <source>The game has been closed.</source>
         <translation>ゲームがクローズされました。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>◇◇ゲーム開始！◇◇</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <source>%1 has joined the game.</source>
         <translation>%1 がゲームに参加した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 が観戦に参加した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <source>You have been kicked out of the game.</source>
         <translation>ゲームからキックされました。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 はゲームから離脱した（%2）。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 はゲーム開始の準備が完了した！！</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation>%1 は %3 に%2を貸した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 は %3 に%2を見せた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 は%2を公開した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 は%3無作為に %2 を選び、公開した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 は%3 %2 を公開した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>逆転</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>順転</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>表</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>裏</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>■ %1 のターン■</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 は %2 を通常どおりアンタップするように設定した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <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="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 はサイドボードをロックした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 はサイドボードを解禁した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 は自分のコントロールするパーマネントをタップした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 は自分のコントロールするパーマネントをアンタップした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 は %2 をタップした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 は %2 をアンタップした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 は%2を切り直した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 は %2 をはずした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 は最後に引いたカードを戻した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 は最後に引いたカード ( %2 ) を戻した 。</translation>
     </message>
@@ -6301,110 +6255,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>ここに入力してください</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>定型文を追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>定型文を編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation>定型文を削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>定型文を追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>定型文:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>定型文を編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>チャット設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>反応するキーワード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>メンション機能を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>メンション補完を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation>定型文</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation>ゲーム内メッセージマクロの使い方</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>未登録ユーザーのルームメッセージを無視</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>未登録ユーザーの個人チャットを無視</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>反転テキストの色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>個人チャットのデスクトップ通知を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Enable desktop notification for mentions</source>
         <translation>メンションのデスクトップ通知を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable room message history on join</source>
         <translation>参加時にルームのメッセージ履歴を表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(色は16進数)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>英数字のみ使用可能。単語を半角スペースで区切って下さい。</translation>
     </message>
@@ -6417,37 +6371,32 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6589,57 +6538,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>アンタップ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>アップキープ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>ドロー・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>戦闘前メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>戦闘開始ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>攻撃クリーチャー指定ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>ブロック・クリーチャー指定ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>戦闘ダメージ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>戦闘終了ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>戦闘後メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>最終フェイズ</translation>
     </message>
@@ -6656,138 +6605,134 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6795,65 +6740,48 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation>優先設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation>ピン留めする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation>ピン留めを外す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation>関連カードを見る</translation>
     </message>
@@ -6902,25 +6830,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation>提供日時順</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation>降順</translation>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7059,33 +6979,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7234,37 +7127,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7307,14 +7200,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>ゲーム数</translation>
     </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>
@@ -7379,53 +7264,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation>すべてのショートカットを元に戻す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation>すべてのショートカットをクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>本当にすべてのショートカットキーをクリアしますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>セクション:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>アクション:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>ショートカット:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation>ショートカットキーの設定方法について（英語）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation>すべてのショートカットをクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation>ショートカット名で検索</translation>
     </message>
@@ -7494,27 +7379,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>サウンドを有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>現在のサウンドテーマ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation>サウンドテスト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>サウンド設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>音量</translation>
     </message>
@@ -7730,123 +7615,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7854,52 +7675,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>カード情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>デッキ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>フィルタ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>レイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>表示する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>別ウィンドウにする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>レイアウトをリセット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>デッキ: %1</translation>
     </message>
@@ -7907,55 +7736,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -8020,7 +7855,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>新しいフォルダーを作成する</translation>
     </message>
@@ -8102,18 +7937,18 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>新しいフォルダの名前:</translation>
     </message>
@@ -8131,12 +7966,12 @@ Please enter a name:</source>
         <translation>ビジュアルデッキストレージ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8185,191 +8020,197 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>リプレイ</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>ゲーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>プレイヤーリスト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>カード情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</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="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>リプレイタイムライン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</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="289"/>
         <source>&amp;Game</source>
         <translation>ゲーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</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="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</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="300"/>
         <source>Reverse turn order</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="303"/>
         <source>&amp;Remove all local arrows</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="306"/>
         <source>Rotate View Cl&amp;ockwise</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="309"/>
         <source>Rotate View Co&amp;unterclockwise</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="312"/>
         <source>Game &amp;information</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="315"/>
         <source>Un&amp;concede</source>
         <translation>投了を撤回</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>投了する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>ゲームから離脱する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>リプレイを閉じる</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation>発言欄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation>レイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>表示する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>別ウィンドウにする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>レイアウトをリセット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>投了する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>投了を取り消す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>ゲームから離脱する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation>プレイヤーがゲーム#%1に参加した。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the game</source>
         <translation>%1 がゲームに参加した</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>ゲームからキックされました。</translation>
     </message>
@@ -9471,152 +9312,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>インターフェース全般設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <source>Annotate card text on tokens</source>
         <translation>トークンのカードテキストを注釈にもつける</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>通知設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation>タスクバーの通知を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>アニメーション設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>タップ/アンタップアニメーション</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation>デッキエディタ/ストレージ設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <source>Open deck in new tab by default</source>
         <translation>デフォルトでデッキを新しいタブで開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <source>Use visual deck storage in game lobby</source>
         <translation>ゲームロビーでビジュアルデッキストレージを使用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation>リプレイ設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9680,24 +9511,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9724,108 +9554,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9833,32 +9580,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9894,7 +9631,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9902,19 +9639,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9922,37 +9659,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9966,22 +9693,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9989,64 +9746,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10054,17 +9803,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10080,52 +9829,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10226,133 +9970,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <source>Move selected set to the top</source>
         <translation>選択したセットを一番上へ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation>選択中のセットを上へ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation>選択中のセットを下へ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <source>Move selected set to the bottom</source>
         <translation>選択したセットを一番下へ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <source>Search by set name, code, or type</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="71"/>
         <source>Default order</source>
         <translation>初期順に戻す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation>元のアートの優先順位を復元する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>すべてのセットを有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>すべてのセットを無効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation>選択したセットを有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation>選択したセットを無効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>デッキエディター</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>カードアート</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="135"/>
         <source>How to use custom card art</source>
         <translation>カスタムカードアートの使い方</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>ヒント</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>注意</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>セットを管理</translation>
     </message>
@@ -10360,72 +10104,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</source>
         <translation>グループなし</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Group by Type</source>
         <translation>タイプ別グループ</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <source>Group by Mana Value</source>
         <translation>マナ・コスト別グループ</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Color</source>
         <translation>色別グループ</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</source>
         <translation>順不同</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Sort by Name</source>
         <translation>名前順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Type</source>
         <translation>タイプ順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation>マナ・コスト順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation>色順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation>P/T順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation>セット順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>閉じる時に切り直す</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>タイプ別に重ねて表示</translation>
     </message>
@@ -10460,7 +10204,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>デッキエディター</translation>
     </message>
@@ -10541,7 +10285,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation>リプレイ</translation>
     </message>
@@ -10693,7 +10437,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>レイアウトをリセット</translation>
     </message>
@@ -11114,8 +10858,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -11135,102 +10878,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <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="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>カードをコピー</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>トークンを生成する...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>ライブラリーの一番下</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>追放領域</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>墓地</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>手札</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>ライブラリーの一番上</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
@@ -11266,246 +11005,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>スタック</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>ゲームから退出</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>投了</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>マリガン</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>更新</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_ko.ts b/cockatrice/translations/cockatrice_ko.ts
index 5ec1dac77..15237cc62 100644
--- a/cockatrice/translations/cockatrice_ko.ts
+++ b/cockatrice/translations/cockatrice_ko.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,60 +36,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>테마 설정</translation>
     </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>Current theme:</source>
         <translation>현재 테마:</translation>
     </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>Open themes folder</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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>카드 렌더링</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <source>Display card names on cards having a picture</source>
         <translation>이미지가 존재하는 카드에도 카드 이름 표시</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <source>Scale cards on mouse over</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="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>손 레이아웃</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>손의 카드를 가로로 정렬</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>손의 카드를 좌측으로 정렬</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>테이블 격자 레이아웃</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>전장의 상하배치를 전환 (대지를 앞에 배치)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>다열 레이아웃를 위한 최소 플레이어 인원 (4명 이상 권장)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>카드 정보에 표시할 폰트의 최대 크기:</translation>
     </message>
@@ -300,12 +322,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +642,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -676,124 +693,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</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="439"/>
         <source>&amp;Select All</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="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -809,133 +826,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -997,7 +1014,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1028,32 +1045,32 @@ 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/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,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="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>성공</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>URL 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>URL 수정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>새 URL 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>URL 제거</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</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="1284"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1467,32 +1484,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>카드 장수</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>카드 이름</translation>
     </message>
@@ -1528,12 +1545,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1750,32 +1767,32 @@ 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/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation>사이드보드 카드 교체 불가능</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <source>The selected file could not be loaded.</source>
         <translation>지정하신 파일을 불러올 수 없었습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2867,17 +2884,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <source>Load deck from clipboard</source>
         <translation>클립보드에서 덱 가져오기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>클립보드의 덱 리스트를 읽어올 수 없습니다.</translation>
     </message>
@@ -2885,43 +2902,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2940,73 +2957,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3167,12 +3151,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <source>Unknown Error loading card database</source>
         <translation>데이터베이스를 불러올 때 미상의 오류가 발생하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3189,7 +3173,7 @@ Would you like to change your database location setting?</source>
 데이터베이스 경로를 다시 설정하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3206,7 +3190,7 @@ 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="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3215,7 +3199,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3224,7 +3208,7 @@ Would you like to change your database location setting?</source>
 데이터베이스 경로를 다시 설정하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3233,7 +3217,7 @@ Would you like to change your database location setting?</source>
 데이터베이스 경로를 다시 설정하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3242,61 +3226,61 @@ 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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</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="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>환경설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>일반</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>외형</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>인터페이스</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>소리</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>단축키</translation>
     </message>
@@ -3610,67 +3594,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4118,143 +4102,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>경로 선택</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>개인 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>언어:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>디렉토리 경로</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <source>Decks directory:</source>
         <translation>덱 파일 경로:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <source>Replays directory:</source>
         <translation>리플레이 파일 경로:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
         <source>Pictures directory:</source>
         <translation>카드 이미지 경로:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
         <source>Card database:</source>
         <translation>카드 데이터베이스 경로:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <source>Token database:</source>
         <translation>토큰 데이터베이스 경로:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4262,47 +4246,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4310,88 +4294,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4399,52 +4383,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4452,213 +4436,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4754,8 +4718,18 @@ Will now login.</source>
 로그인합니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>플레이어 인원</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation>최대 플레이어 인원을 입력해 주세요.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>플레이어 %1</translation>
     </message>
@@ -4858,8 +4832,8 @@ Will now login.</source>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
@@ -5269,144 +5243,144 @@ Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>카드 데이터베이스</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>예</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>아니오</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>설정 열기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <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="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>셋 보기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>환영합니다</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>알림</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <source>A card database update is already running.</source>
         <translation>이미 카드 데이터베이스 업데이트가 진행 중입니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <source>Unable to run the card database updater: </source>
         <translation>카드 데이터베이스 업데이트를 진행할 수 없습니다:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5414,54 +5388,54 @@ 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="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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
@@ -5512,7 +5486,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5666,233 +5640,223 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>전장에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation>추방 영역에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation>자신의 손에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s library</source>
         <translation>%1의 서고에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation>사이드보드에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation>스택에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</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="153"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1님이 토큰 생성: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1이(가) 덱을 불러왔습니다. (해시값: %2)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>카드 한 장</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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="317"/>
-        <source>%1 exiles %2%3 face down.</source>
+        <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -5901,375 +5865,365 @@ Cockatrice will now reload the card database.</source>
         <translation>%1이(가) %3 있던 %2을(를) 추방합니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1이(가) %3서 %2을(를) 플레이 하였습니다.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <source>The game has been closed.</source>
         <translation>게임이 종료되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>게임이 시작되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <source>%1 has joined the game.</source>
         <translation>%1님이 게임에 입장했습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <source>%1 is now watching the game.</source>
         <translation>%1이(가) 관전을 시작하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <source>You have been kicked out of the game.</source>
         <translation>게임에서 강제 퇴장 당하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <source>%1 has left the game (%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="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1님이 게임 시작 준비를 끝냈습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1님이 %2을(를) 공개.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <source>%1 reveals %2%3 to %4.</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="557"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>앞면</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>뒷면</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>%1의 차례입니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>%1님이 자신의 지속물을 탭.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1님이 자신의 지속물을 언탭.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1님이 %2을(를) 탭.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1님이 %2을(를) 언탭.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1님이 %2를 셔플했습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1님이 %2을(를) 뗴어냈습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -6277,110 +6231,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>메세지 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>메세지:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>대화 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>키워드 알림</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>대화 중 본인의 사용자명 멘션 시 해당 문장을 강조</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>멘션 자동완성 기능</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation>게임 내 대화 매크로</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>서버에 가입하지 않은 사용자의 채널 대화 차단</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>문장 색 반전</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>1:1 대화를 받을 시 데스크탑 알림 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Enable desktop notification for mentions</source>
         <translation>자신의 사용자명 멘션 시 데스크탑 알림 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable room message history on join</source>
         <translation>채널 입장 시 이전 대화 기록 표시</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(16진수 색상 코드)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>각 단어마다 스페이스바로 띄어써주세요. 문자 및 숫자만 가능합니다.</translation>
     </message>
@@ -6393,37 +6347,32 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6565,57 +6514,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>언탭단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>유지단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>뽑기단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>첫번째 본단계</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>전투 시작단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>공격자 선언단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>방어자 선언단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>전투 피해단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>전투 종료단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>두번째 본단계</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>종료단</translation>
     </message>
@@ -6632,138 +6581,134 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6771,65 +6716,48 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6878,25 +6806,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7035,33 +6955,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7210,37 +7103,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7283,14 +7176,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>게임</translation>
     </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>
@@ -7355,53 +7240,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7468,27 +7353,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>음향 효과 켜기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>현재 소리 테마:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation>시스템 사운드 엔진 테스트</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>음향 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>주 음량</translation>
     </message>
@@ -7704,123 +7589,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7828,52 +7649,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>카드 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>덱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>카드 필터</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>표시</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>띄우기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>화면 레이아웃 초기화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>덱 편집기: %1</translation>
     </message>
@@ -7881,55 +7710,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7994,7 +7829,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>새 폴더</translation>
     </message>
@@ -8076,18 +7911,18 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>새 폴더의 이름:</translation>
     </message>
@@ -8105,12 +7940,12 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8159,191 +7994,197 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>리플레이</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>게임</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>플레이어 목록</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>카드 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</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="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>리플레이 타임라인</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</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="289"/>
         <source>&amp;Game</source>
         <translation>게임</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</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="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</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="300"/>
         <source>Reverse turn order</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="303"/>
         <source>&amp;Remove all local arrows</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="306"/>
         <source>Rotate View Cl&amp;ockwise</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="309"/>
         <source>Rotate View Co&amp;unterclockwise</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="312"/>
         <source>Game &amp;information</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="315"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>항복</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>게임 나가기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>리플레이 닫기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation>말하기:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation>&amp;보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>표시</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>띄우기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>레이아웃 초기화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>항복</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>게임 나가기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the 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="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>게임에서 강제 퇴장 당하였습니다.</translation>
     </message>
@@ -9441,152 +9282,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>일반 인터페이스 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <source>Annotate card text on tokens</source>
         <translation>토큰에 카드 텍스트 주석 자동 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation>상태 표시줄 알림 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>애니메이션 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>탭/언탭 애니메이션</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9650,24 +9481,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9694,108 +9524,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9803,32 +9550,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9864,7 +9601,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9872,19 +9609,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9892,37 +9629,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9936,22 +9663,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9959,64 +9716,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10024,17 +9773,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10050,52 +9799,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10196,133 +9940,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <source>Move selected set to the top</source>
         <translation>선택한 확장판을 맨 위로 올리기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation>선택한 확장판을 한 단계 올리기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation>선택한 확장판을 한 단계 내리기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <source>Move selected set to the bottom</source>
         <translation>선택한 확장판을 맨 아래로 내리기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>모든 확장판 활성화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>모든 확장판 비활성화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation>선택한 세트 적용</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation>선택한 세트 미적용</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>덱 편집기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>카드 이미지</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="135"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10330,72 +10074,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</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="229"/>
         <source>Group by Type</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="230"/>
         <source>Group by Mana Value</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="231"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</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="239"/>
         <source>Sort by Name</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="240"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>닫은 후 덱 섞기</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>카드 유형별 행 정렬</translation>
     </message>
@@ -10430,7 +10174,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>덱 편집기</translation>
     </message>
@@ -10511,7 +10255,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -10663,7 +10407,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
@@ -11084,8 +10828,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -11105,102 +10848,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <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="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>추방 영역</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>무덤</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>손</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</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="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
@@ -11236,246 +10975,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>항복</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>멀리건</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_nl.ts b/cockatrice/translations/cockatrice_nl.ts
index 773b042d2..d42347f0b 100644
--- a/cockatrice/translations/cockatrice_nl.ts
+++ b/cockatrice/translations/cockatrice_nl.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Verversen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Interpreteer Setnaam en Nummer (indien beschikbaar)</translation>
     </message>
@@ -36,62 +36,62 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <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="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <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="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation>Foutmelding</translation>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation>Deck opslaan</translation>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <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>
@@ -101,7 +101,7 @@ Kijk na of je schrijfrechten tot de folder hebt, en probeer opnieuw.</translatio
     <message>
         <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
         <source>Add Analytics Panel</source>
-        <translation>Analyse Paneel Toevoegen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -133,168 +133,202 @@ Kijk na of je schrijfrechten tot de folder hebt, en probeer opnieuw.</translatio
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation>secondes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation>Bevestig Wijziging</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Thema opties</translation>
     </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>Current theme:</source>
         <translation>Huidige thema:</translation>
     </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>Open themes folder</source>
-        <translation>Themasmap Openen</translation>
+        <translation>Open themafolder</translation>
     </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>Home tab background source:</source>
         <translation>Starttabblad achtergrond bron:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation>Starttabblad achtergrond verversperiode.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation>Uitgeschakeld</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <source>Display card name of background in bottom right:</source>
-        <translation>Kaartnaam van achtergrond rechtsonder weergeven</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation>Menu instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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="734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <source>Show game filter toolbar above list in room tab</source>
-        <translation>Spelfilter werkbalk weergeven boven lijst in kamertab</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Kaartweergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
-        <translation>Zijwaardse kaarten gedraaid weergeven</translation>
+        <translation>Draai kaarten samen met zijwaardse layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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="742"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <source>Use rounded card corners</source>
         <translation>Ronde kaarthoekjes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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="748"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation>rijen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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="752"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation>Kaart-counters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</source>
         <translation>Counter %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
         <source>Hand layout</source>
         <translation>Handweergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>Linker justificatie inschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Tafelindeling</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Verticale coördinaat omkeren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximale lettergrootte voor informatie die op kaarten wordt weergegeven:</translation>
     </message>
@@ -302,14 +336,9 @@ Kijk na of je schrijfrechten tot de folder hebt, en probeer opnieuw.</translatio
 <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>Terug naar resultaten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
-        <translation>Open Deck in Deckbewerker</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -533,7 +562,7 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
     <message>
         <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
         <source>Name (Exact)</source>
-        <translation>Naam (Exact)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
@@ -627,22 +656,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation>Bekijk gerelateerde kaarten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <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="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -657,12 +686,12 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
     <message>
         <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Set:</source>
-        <translation>Set:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
         <source>Collector Number:</source>
-        <translation>Verzamelnummer:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
@@ -678,124 +707,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation>&amp;Onthul aan....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation>&amp;Alle spelers</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation>Bekijk gerelateerde kaarten</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation>Token: </translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</source>
         <translation>Alle tokens</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="439"/>
         <source>&amp;Select All</source>
         <translation>&amp;Selecteer Alle</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="440"/>
         <source>S&amp;elect Row</source>
         <translation>S&amp;electeer Rij</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation>S&amp;electeer Kolom</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation>&amp;Speel</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation>&amp;Verberg</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation>Speel kaart &amp;verdekt</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
-        <translation>&amp;Ontappen overslaan</translation>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>&amp;Normal ontappen schakelen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <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="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation>&amp;Kloneer</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <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="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation>&amp;Losmaken</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation>&amp;Teken pijl....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation>Aantekeningen &amp;zetten....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation>Kaart-&amp;counters</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <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="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Verwijder counter (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>Counters &amp;instellen (%1)...</translation>
     </message>
@@ -811,133 +840,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>hun hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <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="187"/>
+        <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="189"/>
         <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="190"/>
-        <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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation>hun library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>hun library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>hun kerkhof</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>hun verbannen</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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="203"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</comment>
+        <translation>hun sideboard</translation>
+    </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>%1s sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
-        <source>their sideboard</source>
-        <comment>nominative</comment>
-        <translation>hun sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
-        <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="212"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>%1s aangepaste zone &apos;%2&apos;</translation>
@@ -978,36 +1007,36 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
     <message>
         <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
         <source>Add Panel</source>
-        <translation>Paneel Toevoegen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
         <source>Remove Panel</source>
-        <translation>Paneel Verwijderen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
         <source>Save Layout</source>
-        <translation>Indeling Opslaan</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
         <source>Load Layout</source>
-        <translation>Indeling Laden</translation>
+        <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
-        <translation>Kaartdatabase</translation>
+        <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="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Kaartinfo</translation>
     </message>
@@ -1030,32 +1059,32 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
         <translation>Toevoegen aan sideboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation>Selecteer Druk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <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="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Kaart aan &amp;sideboard toevoegen</translation>
     </message>
@@ -1063,32 +1092,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
-        <translation>Database Laden...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation>Vaandelkaart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation>Hoofdtype</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation>Mana Kosten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation>Kleuren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation>Selecteer Druk</translation>
     </message>
@@ -1130,7 +1159,7 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
     <message>
         <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Format:</source>
-        <translation>Format:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
@@ -1161,17 +1190,17 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <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="140"/>
         <source>&amp;Clear all filters</source>
         <translation>&amp;Wis alle filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation>Selectie verwijderen</translation>
     </message>
@@ -1181,7 +1210,7 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
     <message>
         <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
-        <translation>&amp;Deckbewerker</translation>
+        <translation>&amp;Deck Editor</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
@@ -1294,7 +1323,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation>Drukselector</translation>
     </message>
@@ -1302,166 +1331,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Update Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Succes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <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="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <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="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>URL toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>URL bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation>Netwerk Cache Grootte:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation>Redirect Cache TTL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation>Afbeeldingen Cache Grootte:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>Nieuwe URL toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>URL verwijderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>Dag(en)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Bijwerken...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Kies locatie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>URL Download Prioriteit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>Spoilers Automatisch Downloaden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Locatie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Laatste Wijziging</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <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="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <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="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <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="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>Gedownloade Afbeeldingen Verwijderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>Reset Download URL&apos;s</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation>Cache op schijf voor gedownloade afbeeldingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <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>
     </message>
@@ -1469,60 +1498,60 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
-        <translation>Ontdoen</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Redo</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>Herdoen</translation>
+        <source>Undo/Redo history</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>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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
-        <translation>[herdoen]</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
-        <translation>[ontdoen]</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation>Hoeveelheid</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation>Provider ID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Kaart</translation>
     </message>
@@ -1530,12 +1559,12 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation>Algemene deckformaten (%1)</translation>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation>Alle bestanden (*.*)</translation>
     </message>
@@ -1632,94 +1661,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation>Vaandelkaart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <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="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <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="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation>Geannoteerd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <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="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <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="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <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="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <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="488"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation>Foutmelding</translation>
     </message>
     <message>
-        <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="415"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation>Verwijderen mislukt</translation>
     </message>
@@ -1729,57 +1758,57 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
     <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>
+        <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>Opmerkingen bijgewerkt (van %1 karakters naar %2 karakters)</translation>
+        <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>Vaandelkaart veranderd naar %1 (%2)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
         <source>Tags changed</source>
-        <translation>Tags veranderd</translation>
+        <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>Format veranderd naar %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <source>Added (%1): %2 (%3) %4</source>
-        <translation>Toegevoegd (%1): %2 (%3) %4</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation>Verplaatst naar %1 1 × &quot;%2&quot; (%3)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation>Verwijderd &quot;%1&quot; (alle exemplaren)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation>%1 1 × &quot;%2&quot; (%3)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
-        <translation>Toegevoegd</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
-        <translation>Verwijderd</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1844,30 +1873,30 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
         <translation>Sideboard vergrendeld</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <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="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -2078,17 +2107,17 @@ Wil je het deck omzetten naar het .cod-formaat?</translation>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
         <source>Only &amp;buddies can join</source>
-        <translation>Alleen &amp;maatjes kunnen aansluiten</translation>
+        <translation>Alleen &amp;vrienden kunnen meedoen</translation>
     </message>
     <message>
         <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 aansluiten</translation>
+        <translation>Alleen ge&amp;registreerde gebruikers kunnen meedoen</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
         <source>Joining restrictions</source>
-        <translation>Restricties voor aansluiten</translation>
+        <translation>Restricties voor meedoen</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
@@ -2133,7 +2162,7 @@ Wil je het deck omzetten naar het .cod-formaat?</translation>
     <message>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
@@ -2362,17 +2391,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <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="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation>Niet geldige deck lijst.</translation>
     </message>
@@ -2575,7 +2604,7 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
-        <translation>Verberg &apos;alleen maatjes&apos; spellen</translation>
+        <translation>Verberg &apos;alleen vrienden&apos; spellen</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
@@ -2601,7 +2630,7 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
         <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
         <source>Hide games not created by buddies</source>
         <oldsource>Hide games not created by buddy</oldsource>
-        <translation>Verberg spellen niet aangemaakt door maatjes</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
@@ -2873,17 +2902,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Niet geldige deck lijst.</translation>
     </message>
@@ -2891,45 +2920,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <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="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <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="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
         <source>Received empty deck data.</source>
-        <translation>Lege deckinformatie ontvangen.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <source>Failed to parse deck data: %1</source>
-        <translation>Parsen deckinformatie mislukt: %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2937,13 +2966,7 @@ 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>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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2954,73 +2977,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
         <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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <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="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation>Hoeveelheid resultaten:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation>Speel resultaten automatisch</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
-        <translation>Er zijn geen kaarten die bij deze zoekopdracht passen in de kaartendatabase. Toch doorgaan?</translation>
+        <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="85"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>Ongeldige filter</translation>
     </message>
@@ -3141,53 +3131,53 @@ Je email zal gebruikt worden om je account te controleren.</translation>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
-        <translation>Onaangepaste Kaarten:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
-        <translation>Aangepaste Kaarten:</translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
-        <translation>Alle naar voorkeur instellen</translation>
+        <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>Drukken aangepast als groep</translation>
+        <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>Alle drukinformatie gewist</translation>
+        <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>Alle drukken naar voorkeur instellen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3204,7 +3194,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3221,7 +3211,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3234,7 +3224,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3243,7 +3233,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3252,7 +3242,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3265,59 +3255,59 @@ 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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Weergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Gebruikersomgeving</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>Kaart Bronnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Geluid</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Sneltoetsen</translation>
     </message>
@@ -3327,41 +3317,39 @@ Wilt u uw database lokatie aanpassen?</translation>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
-        <translation>Kaartbewerkingscontrole</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
-        <translation>In voorgrond uitvoeren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
-        <translation>In achtergrond uitvoeren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
-        <translation>Altijd in achtergrond uitvoeren vanaf nu</translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
-        <translation>Niet nu uitvoeren</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3427,7 +3415,7 @@ Ga naar de downloadpagina om handmatig bij te werken.</translation>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
-        <translation>Bewerkingen downloaden: %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
@@ -3503,13 +3491,12 @@ Ga naar de downloadpagina om handmatig bij te werken.</translation>
         <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>Helaas, de automatische bewerker is niet geslaagd in het vinden van een toepasselijke download.
-Je moet misschien handmatig de nieuwe versie downloaden.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
@@ -3572,131 +3559,131 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <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>
+        <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>Criteria:</translation>
+        <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>Kaartnaam</translation>
+        <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</translation>
+        <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>Subtype</translation>
+        <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>Manawaarde</translation>
+        <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>Precisie:</translation>
+        <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>Minstens</translation>
+        <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>Precies</translation>
+        <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>Kwantiteit (N):</translation>
+        <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>Kaarten getrokken (M):</translation>
+        <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>kaarten</translation>
+        <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"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
         <source>Draw Probability</source>
-        <translation>Raapkans</translation>
+        <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>Probability of drawing</source>
-        <translation>Kans op rapen</translation>
+        <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>Card Name</source>
-        <translation>Kaartnaam</translation>
+        <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>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation>Subtype</translation>
+        <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>Mana Value</source>
-        <translation>Manawaarde</translation>
+        <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="109"/>
-        <source>At least</source>
-        <translation>Minstens</translation>
+        <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>Exactly</source>
-        <translation>Precies</translation>
+        <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="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation>kaart(en) na het rapen van</translation>
+        <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>cards</source>
-        <translation>kaarten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Qty</source>
-        <translation>Hoeveel</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
-        <translation>Kans (%)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3704,12 +3691,12 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <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>In %1 decks</translation>
+        <translation type="unfinished"/>
     </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>%1 van %2 decks</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3765,7 +3752,7 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <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>%1% Synergie</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3773,7 +3760,7 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3781,7 +3768,7 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3789,12 +3776,12 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <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>
+        <translation type="unfinished"/>
     </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>Gemiddeld Deck</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3802,7 +3789,7 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
         <source>Salt: </source>
-        <translation>Zoutigheid:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3823,17 +3810,17 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <message>
         <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>Weet je zeker dat je de filter &apos;%1&apos; wil verwijderen?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
-        <translation>Verwijderen Mislukt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>Verwijderen van filter &apos;%1&apos; mislukt.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3841,7 +3828,7 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <message>
         <location filename="src/game/game_event_handler.cpp" line="412"/>
         <source>kicked by game host or moderator</source>
-        <translation>er uit geschopt door spelmaker of moderator</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/game_event_handler.cpp" line="415"/>
@@ -3851,7 +3838,7 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <message>
         <location filename="src/game/game_event_handler.cpp" line="418"/>
         <source>player disconnected from server</source>
-        <translation>speler verbrak verbinding van server</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/game_event_handler.cpp" line="422"/>
@@ -3907,7 +3894,7 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <message>
         <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>Dit spel is alleen toegankelijk voor de maatjes van de maker van dit spel.</translation>
+        <translation>Dit spel staat alleen open voor de vrienden van de maker van dit spel.</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
@@ -3932,12 +3919,12 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
         <source>Join Game as Judge</source>
-        <translation>Bij Spel Aansluiten als Judge</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
         <source>Spectate Game as Judge</source>
-        <translation>Spel Toeschouwen als Judge</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
@@ -3977,7 +3964,7 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>Join as judge</source>
-        <translation>Aansluiten als judge</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
@@ -3987,7 +3974,7 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
         <source>Join as judge spectator</source>
-        <translation>Aansluiten als judge toeschouwer</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
@@ -4005,32 +3992,32 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <message>
         <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
         <source>All types</source>
-        <translation>Alle types</translation>
+        <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>Filter op spelnaam...</translation>
+        <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>Filter op speltype/format</translation>
+        <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>Verberg spellen niet gemaakt door maatjes</translation>
+        <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>Verberg volle spellen</translation>
+        <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>Verberg begonnen spellen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4065,7 +4052,7 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <message>
         <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
         <source>buddies only</source>
-        <translation>alleen maatjes</translation>
+        <translation>enkel vrienden</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
@@ -4075,7 +4062,7 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     <message>
         <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
         <source>open decklists</source>
-        <translation>decklijsten gedeeld</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
@@ -4142,549 +4129,529 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Kies pad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Persoonlijke instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Taal:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>Paden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <source>How to help with translations</source>
-        <translation>Hoe met vertalen te helpen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <source>Filters directory:</source>
-        <translation>Filters map:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <source>Check for client updates on startup</source>
-        <translation>Controleren op client-updates bij opstarten</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <source>Check for card database updates on startup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
-        <source>Check for card database updates on startup</source>
-        <translation>Controleren op kaartendatabasebewerkingen bij opstarten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
         <source>Don&apos;t check</source>
-        <translation>Niet controleren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="383"/>
         <source>Prompt for update</source>
-        <translation>Vragen om bewerking</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="385"/>
+        <source>Always update in the background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
-        <source>Always update in the background</source>
-        <translation>Altijd in achtergrond bewerken</translation>
+        <source>Check for card database updates every</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
-        <source>Check for card database updates every</source>
-        <translation>Controleren op kaartendatabasebewerkingen iedere</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <source> days</source>
         <translation>dagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
-        <translation>Laatste controle op %1 (%2 dagen geleden)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
-        <translation>&amp;Graveyard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <source>&amp;View graveyard</source>
-        <translation>&amp;Bekijk graveyard</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="102"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation>&amp;Verplaats graveyard naar...</translation>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation>&amp;Bovenkant van library</translation>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="72"/>
+        <source>&amp;All players</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation>&amp;Onderkant van library</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation>&amp;Alle spelers</translation>
+        <source>&amp;Hand</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Hand</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Exile</source>
-        <translation>&amp;Exile</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
-        <translation>Onthul willekeurige kaart aan...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
-        <translation>&amp;Hand</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
-        <translation>&amp;Bekijk hand</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
+        <source>Sort hand by...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation>Sorteer hand op...</translation>
+        <source>Name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation>Naam</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation>Type</translation>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation>Manawaarde</translation>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
+        <source>Take &amp;mulligan (Choose hand size)</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>Neem &amp;mulligan (Kies handgrootte)</translation>
+        <source>Take mulligan (Same 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>Neem mulligan (Dezelfde handgrootte)</translation>
+        <source>Take mulligan (Hand size - 1)</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>Neem mulligan (Handgrootte - 1)</translation>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
+        <source>&amp;Move hand to...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation>&amp;Verplaats hand naar....</translation>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top of library</source>
-        <translation>&amp;Bovenkant van library</translation>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
-        <source>&amp;Bottom of library</source>
-        <translation>&amp;Onderkant van library</translation>
+        <source>&amp;Graveyard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Graveyard</translation>
+        <source>&amp;Exile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exile</translation>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation>&amp;Onthul hand aan....</translation>
-    </message>
-    <message>
-        <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>Alle spelers</translation>
-    </message>
-    <message>
         <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <source>All players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
-        <translation>Onthul &amp;willekeurige kaart aan....</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
-        <translation>Maak Nieuw Deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
-        <translation>Decks Doorbladeren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
-        <translation>Kaartendatabase Doorbladeren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
-        <translation>EDHRec Doorbladeren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
-        <translation>Archidekt Doorbladeren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
-        <translation>Replays Inzien</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
-        <translation>Sluiten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
-        <translation>Verbinden...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
-        <translation>Verbinden</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
-        <translation>Spelen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</source>
-        <translation>&amp;Library</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <source>&amp;View library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <source>View &amp;top cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <source>Reveal &amp;library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <source>&amp;Always reveal top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <source>&amp;Draw card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <source>D&amp;raw cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <source>&amp;Undo last draw</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation>&amp;Bekijk library</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation>Bekijk &amp;bovenste kaarten van library....</translation>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation>Bekijk onderste kaarten van library...</translation>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation>Onthul &amp;library aan...</translation>
+        <source>Play top card &amp;face down</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</source>
-        <translation>Leen library aan...</translation>
+        <source>Put top card on &amp;bottom</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
-        <source>Reveal &amp;top cards to...</source>
-        <translation>&amp;Onthul bovenste kaarten aan....</translation>
+        <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"/>
-        <source>&amp;Top of library...</source>
-        <translation>&amp;Bovenkant van library...</translation>
+        <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"/>
-        <source>&amp;Bottom of library...</source>
-        <translation>&amp;Onderkant van library...</translation>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
-        <source>&amp;Always reveal top card</source>
-        <translation>Toon &amp;altijd bovenste kaart</translation>
+        <source>Move top cards to &amp;exile...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation>&amp;Altijd bovenste kaart bekijken</translation>
+        <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"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation>&amp;Open deck in deckbewerker</translation>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation>&amp;Raap kaart</translation>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw cards...</source>
-        <translation>R&amp;aap kaarten...</translation>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
-        <source>&amp;Undo last draw</source>
-        <translation>&amp;Ontdoe laatste raap</translation>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation>Schudden</translation>
+        <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"/>
+        <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"/>
-        <source>&amp;Play top card</source>
-        <translation>&amp;Speel bovenste kaart</translation>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
-        <source>Play top card &amp;face down</source>
-        <translation>Speel bovenste kaart &amp;verdekt</translation>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation>Leg bovenste kaart aan de &amp;onderkant</translation>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation>Verplaats bovenste kaart naar grave&amp;yard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation>Verplaats bovenste kaart naar exile</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <source>Move top cards to &amp;graveyard...</source>
-        <translation>Verplaats bovenste kaarten naar &amp;graveyard....</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="235"/>
-        <source>Move top cards to graveyard face down...</source>
-        <translation>Verplaats bovenste kaarten naar &amp;graveyard verdekt....</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="236"/>
-        <source>Move top cards to &amp;exile...</source>
-        <translation>Verplaats bovenste kaarten naar &amp;exile....</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="237"/>
-        <source>Move top cards to exile face down...</source>
-        <translation>Verplaats bovenste kaarten naar exile verdekt....</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="238"/>
-        <source>Put top cards on stack &amp;until...</source>
-        <translation>Plaats bovenste kaart op stack &amp;totdat...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
-        <source>Shuffle top cards...</source>
-        <translation>Schud bovenste kaarten...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation>&amp;Raap onderste kaart</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation>R&amp;aap onderste kaarten...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation>&amp;Speel onderste kaart</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation>Speel onderste kaart &amp;verdekt</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation>Verplaats onderste kaart naar grave&amp;yard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation>Verplaats onderste kaart naar e&amp;xile</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <source>Move bottom cards to &amp;graveyard...</source>
-        <translation>Verplaats onderste kaarten naar &amp;graveyard....</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="248"/>
-        <source>Move bottom cards to graveyard face down...</source>
-        <translation>Verplaats onderste kaarten naar graveyard verdekt....</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="249"/>
-        <source>Move bottom cards to &amp;exile...</source>
-        <translation>Verplaats onderste kaarten naar &amp;exile...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="250"/>
-        <source>Move bottom cards to exile face down...</source>
-        <translation>Verplaats onderste kaarten naar exile verdekt...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="251"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation>Leg onderste kaart &amp;bovenop</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
         <source>Shuffle bottom cards...</source>
-        <translation>Schud onderste kaarten...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
-        <translation>&amp;Alle spelers</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
-        <translation>Onthul bovenste kaarten van library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
-        <translation>Aantal kaarten: (max. %1)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4780,8 +4747,18 @@ Will now login.</source>
 Logt nu in.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Aantal spelers</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <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="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Speler %1</translation>
     </message>
@@ -4884,8 +4861,8 @@ Logt nu in.</translation>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
@@ -5089,7 +5066,7 @@ Dit betekent meestal dat uw clientversie verouderd is en dat de server een antwo
     <message>
         <location filename="src/interface/window_main.cpp" line="577"/>
         <source>The connection to the server has been lost.</source>
-        <translation>De verbinding met de server is verloren gegaan.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/window_main.cpp" line="581"/>
@@ -5160,7 +5137,7 @@ Lokale versie is %1, externe versie is %2.</translation>
     <message>
         <location filename="src/interface/window_main.cpp" line="662"/>
         <source>Start &amp;local game...</source>
-        <translation>Start &amp;plaatselijk spel....</translation>
+        <translation>Start &amp;lokaal spel....</translation>
     </message>
     <message>
         <location filename="src/interface/window_main.cpp" line="663"/>
@@ -5235,12 +5212,12 @@ Lokale versie is %1, externe versie is %2.</translation>
     <message>
         <location filename="src/interface/window_main.cpp" line="683"/>
         <source>Reload card database</source>
-        <translation>Kaartendatabase opniew laden</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/window_main.cpp" line="685"/>
         <source>Tabs</source>
-        <translation>Tabs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/window_main.cpp" line="687"/>
@@ -5270,12 +5247,12 @@ Lokale versie is %1, externe versie is %2.</translation>
     <message>
         <location filename="src/interface/window_main.cpp" line="692"/>
         <source>Check for Card Updates (Automatic)</source>
-        <translation>Controleren op kaartbewerkingen (Automatisch)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/window_main.cpp" line="693"/>
         <source>Show Status Bar</source>
-        <translation>Statusbalk Weergeven</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/window_main.cpp" line="694"/>
@@ -5285,7 +5262,7 @@ Lokale versie is %1, externe versie is %2.</translation>
     <message>
         <location filename="src/interface/window_main.cpp" line="695"/>
         <source>Open Settings Folder</source>
-        <translation>Instellingsmap Openen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/window_main.cpp" line="697"/>
@@ -5293,65 +5270,65 @@ Lokale versie is %1, externe versie is %2.</translation>
         <translation>Tonen/Verbergen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>Niewe Versie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice geinstalleerd</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>Kaartdatabase</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Open instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>Nieuwe sets gevonden</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5362,17 +5339,17 @@ Set codes: %1
 Wilt u deze inschakelen?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>Bekijk sets</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Welkom</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5381,65 +5358,64 @@ 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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <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="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <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="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
-        <translation>Kaartendatabasebewerking in uitvoering.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <source>Failed to start. The file might be missing, or permissions might be incorrect.</source>
-        <translation>Opstarten mislukt. Het bestand mist misschien, of toestemmingen zijn misschien incorrect.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
-        <translation>Het proces crashte nadat deze geslaagd is opgestart.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <source>Timed out. The process took too long to respond. The last waitFor...() function timed out.</source>
-        <translation>Tijd verlopen. Het proces nam te lang met antwoorden. De laatste waitfor...() functie verliep.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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>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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
-        <translation>Een fout heeft zich voorgedaan tijdens een poging om te lezen van het proces. Bijvoorbeeld, het proces is niet in uitvoering misschien.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
-        <translation>Een onbekende fout heeft zich voorgedaan.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
-        <translation>De kaartendatabasebewerker sloot af met foutmelding.
-%1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5450,55 +5426,55 @@ Dit is waarschijnlijk geen probleem, maar dit bericht kan betekenen dat er een n
 Om uw client bij te werken, ga naar Hulp -&gt; Controleer op updates.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Laad sets/kaarten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <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="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <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="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Sets/kaarten zijn niet geïmporteerd.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation>Reset Wachtwoord</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <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>
     </message>
@@ -5508,50 +5484,50 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <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>Manabasis Configuratie</translation>
+        <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>Soort weergave:</translation>
+        <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>taart</translation>
+        <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>balk</translation>
+        <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>combinatieBalk</translation>
+        <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>Filter Kleuren (optioneel):</translation>
+        <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>OK</translation>
+        <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>Annuleren</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
-        <translation>Manabasis</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5559,47 +5535,47 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <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>
+        <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</translation>
+        <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>kleur</translation>
+        <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>subtype</translation>
+        <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>kracht</translation>
+        <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>hardheid</translation>
+        <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>Filters (optioneel):</translation>
+        <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>Hoofdbalk rij weergeven</translation>
+        <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>Rij per kategorie weergeven</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5607,7 +5583,7 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <message>
         <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
-        <translation>Manacurve</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5615,27 +5591,27 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <message>
         <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
         <source>Display type:</source>
-        <translation>Soort weergave:</translation>
+        <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>taart</translation>
+        <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>balk</translation>
+        <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>combinatieBalk</translation>
+        <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>Filter Kleuren (optioneel):</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5643,7 +5619,7 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <message>
         <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
-        <translation>Manatoewijding</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5651,27 +5627,27 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <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>
+        <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>taart</translation>
+        <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>balk</translation>
+        <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>Kleuren:</translation>
+        <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>Rij per kleur weergeven</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5679,12 +5655,12 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <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>
+        <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 kaarten)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -5692,621 +5668,601 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <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>
+        <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>Manadistributieinstellingen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>vanuit spel</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation> vanuit hun graveyard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation> vanuit exile</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation> vanuit hun hand.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <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="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <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="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <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="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <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="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <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="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation> van hun library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation> van sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation> van de stack</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
-        <translation>vanaf aangepaste zone &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <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="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <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="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <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="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <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="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
-        <translation>%1 creëert een token verdekt.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <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="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <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="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 vernietigt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>een kaart</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="311"/>
-        <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/log/message_log_widget.cpp" line="313"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="317"/>
-        <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="319"/>
         <source>%1 exiles %2%3.</source>
-        <translation>%1 legt %2%3 in exile.</translation>
+        <translation>%1 exiled %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation>%1 speelt %2%3 verdekt.</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 speelt %2%3.</translation>
     </message>
     <message>
-        <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>%1 verplaatst %2%3 naar aangepaste zone &apos;%4&apos; verdekt.</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="349"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
-        <translation>%1 verplaatst %2%3 naar aangepaste zone &apos;%4&apos;.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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 kijkt naar de %4 %3 kaart %2.</numerusform><numerusform>%1 kijkt naar de %4 %3 kaarten %2.</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
-        <translation>onderkant</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
-        <translation>bovenkant</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <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="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <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="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <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="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>Het spel is begonnen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation>Je bent het spel aan het overstelpen. Wacht een paar seconden.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <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="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <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="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <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="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <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="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <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="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 onthult %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <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="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 onthult %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>omgekeerd</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>normaal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>Kop</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>Munt</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>%1s beurt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
-        <translation><numerusform>%1 plaatst %2 &quot;%3&quot; counter op %4 (nu %5).</numerusform><numerusform>%1 plaatst %2 &quot;%3&quot; counters op %4 (nu %5).</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
-        <translation><numerusform>%1 verwijderd %2 &quot;%3&quot; counter van %4 (nu %5).</numerusform><numerusform>%1 verwijderd %2 &quot;%3&quot; counters van %4 (nu %5).</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <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="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <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="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <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="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 tapt alles.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 ontapt alles.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 tapt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 ontapt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 schudt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 maakt %2 los.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <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="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 legt hun laats getrekte kaart terug (%2).</translation>
     </message>
@@ -6314,110 +6270,110 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>Woord1 Woord2 Woord3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>Bericht toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>Bericht bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation>Bericht Verwijderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Bericht toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Bericht:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>Bericht bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>Chat instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>Aanpasbare alerteringswoorden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>Schakel chat vermeldingen in</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>Vermeldings aanvuller inschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <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="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <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="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>Text kleur inverteren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <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="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <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="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <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="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(Kleur is hexadecimaal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Woorden scheiden met een spatie, alleen alfanumerieke tekens</translation>
     </message>
@@ -6427,42 +6383,37 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <message>
         <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
         <source>Move to</source>
-        <translation>Verplaats naar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
-        <translation>%bovenkant library in willekeurige volgorde</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
-        <translation>X kaarten van bovenkant library...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
-        <translation>&amp;Onderkant library in willekeurige volgorde</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation>&amp;Tafel</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
-        <translation>&amp;Hand</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
-        <translation>&amp;Graveyard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
-        <translation>&amp;Exile</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6510,7 +6461,7 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <message>
         <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
         <source>Layout</source>
-        <translation>Indeling</translation>
+        <translation>Lay-out</translation>
     </message>
     <message>
         <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
@@ -6523,17 +6474,17 @@ 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>Kaarten overlap:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
-        <translation>Overlap percentage:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
-        <translation>Overlap richting:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6602,57 +6553,57 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Untap fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Upkeep fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Draw fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>Eerste hoofdfase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Begin vechtfase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Aanvallers aangeven fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Verdedigers aangeven fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Gevechtsschade fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Einde vechtfase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>Tweede hoofdfase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Einde van de beurt fase</translation>
     </message>
@@ -6669,210 +6620,185 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
-        <translation>Bekijk bovenste kaarten van library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
-        <translation>Aantal kaarten: (max. %1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
-        <translation>Bekijk onderste kaarten library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
-        <translation>Schud bovenste kaarten library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
-        <translation>Schud onderste kaarten library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
-        <translation>Raap hand</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <source>0 and lower are in comparison to current hand size</source>
-        <translation>0 en minder zijn in verhouding tot huidige handgrootte</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
-        <translation>Raap kaarten</translation>
-    </message>
-    <message>
-        <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>graveyard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>exile</translation>
+        <source>Move top cards to grave</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation>Verplaats bovenste kaarten naar %1</translation>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation>Verplaats onderste kaarten naar %1</translation>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
-        <translation>Raap onderste kaarten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
-        <translation>&amp;Maak nog een %1 token</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
-        <translation>Token maken</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
-        <translation>Aantal:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
-        <translation>Plaats kaart X kaarten vanaf bovenkant van library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
-        <translation>Hoeveelste van boven moet de kaart geplaatst worden:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
-        <translation>(max. %1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
-        <translation>Verander kracht/hardheid</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
-        <translation>Verander stats naar:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
-        <translation>Aantekening instellen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
-        <translation>Voer de nieuwe aantekening in:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
-        <translation>Counters instellen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
-        <translation>Speler &quot;%1&quot;</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
-        <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>
+        <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>Drukkiezer opnieuw inschakelen</translation>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <source>Display Navigation Buttons</source>
-        <translation>Navigatieknoppen weergeven</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="155"/>
-        <source>Printing Selector</source>
-        <translation>Drukkiezer</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
-        <translation>Voorkeur</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
-        <translation>Druk Vastpinnen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
-        <translation>Druk Lospinnen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
-        <translation>Gerelateerde kaarten weergeven</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6880,7 +6806,7 @@ Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart
     <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>Zoeken op setnaam of setcode</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6888,17 +6814,17 @@ Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart
     <message>
         <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
-        <translation>Vorige Kaart in Deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
-        <translation>Massaselectie</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
-        <translation>Volgende Kaart in Deck</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6906,36 +6832,28 @@ Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart
     <message>
         <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
-        <translation>Alphabetisch</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
-        <translation>Voorkeur</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
-        <translation>Datum van Uitgave</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
-        <translation>Omlaag</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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="49"/>
         <source>Ascending</source>
-        <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6943,57 +6861,57 @@ Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart
     <message>
         <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
         <source>Power / toughness</source>
-        <translation>Kracht / hardheid</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
         <source>&amp;Increase power</source>
-        <translation>Ver&amp;hoog kracht</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
         <source>&amp;Decrease power</source>
-        <translation>Ver&amp;laag kracht</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
         <source>I&amp;ncrease toughness</source>
-        <translation>Verh&amp;oog hardheid</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
         <source>D&amp;ecrease toughness</source>
-        <translation>Verl&amp;aag hardheid</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
         <source>In&amp;crease power and toughness</source>
-        <translation>Verhoo&amp;g kracht en hardheid</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
         <source>Dec&amp;rease power and toughness</source>
-        <translation>Verlaa&amp;g kracht en hardheid</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
         <source>Increase power and decrease toughness</source>
-        <translation>Verhoog kracht en verlaag hardheid</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
         <source>Decrease power and increase toughness</source>
-        <translation>Verlaag kracht en verhoog hardheid</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
         <source>Set &amp;power and toughness...</source>
-        <translation>Kracht en hardheid &amp;instellen...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
         <source>Reset p&amp;ower and toughness</source>
-        <translation>&amp;Herstel kracht en hardheid</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7069,51 +6987,12 @@ Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart
     <message>
         <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>Bestaand Bestand Overschrijven?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7263,39 +7142,39 @@ Weet je zeker dat je deze functie wil uitschakelen?</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
-        <translation>&amp;Exile</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</source>
-        <translation>&amp;Bekijk exile</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <source>&amp;Move exile to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation>&amp;Verplaats exile naar...</translation>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation>&amp;Bovenkant library</translation>
+        <source>&amp;Hand</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation>&amp;Onderkant library</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Hand</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Graveyard</source>
-        <translation>&amp;Graveyard</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7336,14 +7215,6 @@ Weet je zeker dat je deze functie wil uitschakelen?</translation>
         <translation>Spellen</translation>
     </message>
 </context>
-<context>
-    <name>SayMenu</name>
-    <message>
-        <location filename="src/game/player/menu/say_menu.cpp" line="16"/>
-        <source>S&amp;ay</source>
-        <translation>&amp;Zeg</translation>
-    </message>
-</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -7364,7 +7235,7 @@ Weet je zeker dat je deze functie wil uitschakelen?</translation>
     <message>
         <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
         <source>Shortcut already in use by:</source>
-        <translation>Sneltoets reeds in gebruik door:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
@@ -7408,55 +7279,55 @@ Weet je zeker dat je deze functie wil uitschakelen?</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation>Alle standaard snelkoppelingen herstellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation>Alle standaard snelkoppelingen wissen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>Sectie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>Functie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>Sneltoets:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <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="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation>Alle sneltoetsen wissen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
-        <translation>Zoek op sneltoetsnaam</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7464,12 +7335,12 @@ Weet je zeker dat je deze functie wil uitschakelen?</translation>
     <message>
         <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
-        <translation>Functie</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
-        <translation>Sneltoets</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7512,38 +7383,38 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
         <source>&amp;Sideboard</source>
-        <translation>&amp;Sideboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
         <source>&amp;View sideboard</source>
-        <translation>&amp;Bekijk sideboard</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>&amp;Geluiden inschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>Huidige geluiden thema:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <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="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>Geluidsinstellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>Hoofdvolume</translation>
     </message>
@@ -7602,7 +7473,7 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
         <source>Default</source>
-        <translation>Standaard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
@@ -7630,17 +7501,17 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
-        <translation>Aan Maatjeslijst toevoegen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
-        <translation>Voeg toe aan Negeerlijst</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
         <source>Account</source>
-        <translation>Account</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7673,27 +7544,27 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
         <source>Server moderator functions</source>
-        <translation>Servermoderatiefuncties</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
         <source>Replay ID</source>
-        <translation>Replay ID</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
         <source>Grant Replay Access</source>
-        <translation>Geef Toegang Replay</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
         <source>Username to Activate</source>
-        <translation>Te Activeren Gebruikersnaam</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
         <source>Force Activate User</source>
-        <translation>Forceer Activeren Gebruiker</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
@@ -7709,12 +7580,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>Succesvol</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
         <source>Replay access granted</source>
-        <translation>Toegang replay toegekend</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
@@ -7723,212 +7594,156 @@ 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>Foutmelding</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
-        <translation>Niet mogelijk om toegang tot replay te geven. Replay ID ongeldig</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
         <source>Unable to grant replay access. Internal error</source>
-        <translation>Niet mogelijk om toegang tot replay te geven. Interne fout</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
         <source>User successfully activated</source>
-        <translation>Gebruiker succesvol geactiveerd</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
         <source>Unable to activate user. Username invalid</source>
-        <translation>Niet mogelijk om gebruiker te activeren. Gebruikersnaam ongeldig</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
         <source>Unable to activate user. User already active</source>
-        <translation>Niet mogelijk om gebruiker te activeren. Gebruiker reeds geactiveerd</translation>
+        <translation type="unfinished"/>
     </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>
+        <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <source>Desc.</source>
-        <translation>Afl.</translation>
+        <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>EN</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
+        <source>Asc.</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>Vereis ALLE gekozen kleuren</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</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>Decknaam...</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</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>Eigenaar...</translation>
-    </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>Pakketten</translation>
-    </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>Geavanceerde Filters</translation>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation>Bracket:</translation>
+        <source>Disabled</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>Geen Voorkeur</translation>
-    </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>Bevat kaart...</translation>
-    </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>Commander...</translation>
-    </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>Tag...</translation>
-    </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>Deckgrootte</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation>Kaarten:</translation>
-    </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>Opl.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation>Sorteer op:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation>Filter op:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation>Weergavensinstellingen</translation>
-    </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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <source>Search</source>
-        <translation>Zoeken</translation>
+        <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
-        <translation>Formats</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
-        <translation>Archidekt:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>Kaart info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;Bekijk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
-        <translation>Kaartendatabase</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
-        <translation>Druk</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>Zichtbaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>Zwevend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
-        <translation>Indeling resetten</translation>
+        <translation>Layout resetten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Dek: %1</translation>
     </message>
@@ -7936,57 +7751,63 @@ Controleer uw snelkoppelingsinstellingen!</translation>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <source>Visual Deck: %1</source>
-        <translation>Visueel Deck: %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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="387"/>
         <source>&amp;Visual Deck Editor</source>
-        <translation>&amp;Visuele Deckbewerker</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
-        <translation>Kaarteninfo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
-        <translation>Deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
-        <translation>Filters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
-        <translation>&amp;Bekijk</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
-        <translation>Druk</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
-        <translation>Zichtbaar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
-        <translation>Zwevend</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
-        <translation>Herstel indeling</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7994,22 +7815,22 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
         <source>Visual Deck View</source>
-        <translation>Visuele Deckweergave</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
         <source>Visual Database Display</source>
-        <translation>Visuele Databaseweergave</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
         <source>Deck Analytics</source>
-        <translation>Deckanalyses</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
         <source>Sample Hand</source>
-        <translation>Proefhand</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -8017,7 +7838,7 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
         <source>Local file system</source>
-        <translation>Plaatselijk bestandssysteem</translation>
+        <translation>Lokaal bestandssysteem</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
@@ -8028,12 +7849,12 @@ Controleer uw snelkoppelingsinstellingen!</translation>
         <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>Open deck in bewerker</translation>
+        <translation>Open dek in editor</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
         <source>Rename deck or folder</source>
-        <translation>Hernoem deck of map</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
@@ -8049,9 +7870,9 @@ Controleer uw snelkoppelingsinstellingen!</translation>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
-        <translation>Nieuwe map</translation>
+        <translation>Nieuwe folder</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
@@ -8062,22 +7883,22 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Open decks folder</source>
-        <translation>Deckmap openen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
         <source>Rename local folder</source>
-        <translation>Hernoem plaatselijke map</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
         <source>Rename local file</source>
-        <translation>Hernoem plaatselijk bestand</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
         <source>New name:</source>
-        <translation>Nieuwe naam:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
@@ -8090,7 +7911,7 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
         <source>Rename failed</source>
-        <translation>Hernoemen mislukt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
@@ -8122,33 +7943,33 @@ Please enter a name:</source>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
         <source>Delete local file</source>
-        <translation>Verwijder plaatselijk bestand</translation>
+        <translation>Verwijder lokaal bestand</translation>
     </message>
     <message>
         <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>Weet je zeker dat je de opgeslagen bestanden wil verwijderen?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
-        <translation>Verwijder deck van server</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Are you sure you want to delete the selected decks?</source>
-        <translation>Weet je zeker dat je de geselekteerde decks wil verwijderen?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
-        <translation>Naam van de map:</translation>
+        <translation>Naam van de folder:</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
         <source>Deck Storage</source>
-        <translation>Deckopslag</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -8156,17 +7977,17 @@ Please enter a name:</source>
     <message>
         <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
-        <translation>Visuele Deckopslag</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
-        <translation>Foutmelding</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
-        <translation>Kon deck op %1 niet openen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -8174,7 +7995,7 @@ Please enter a name:</source>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
         <source>EDHREC: </source>
-        <translation>EDHREC:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -8182,222 +8003,228 @@ 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>&amp;Kaarten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
-        <translation>Top Commanders</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
-        <translation>Tags</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
-        <translation>Zoeken op kaart...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
-        <translation>Zoeken</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
-        <translation>EDHRec:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>Replay</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>Spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>Spelerslijst</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>Kaartinfo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</source>
         <translation>Berichten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>Replay Tijdslijn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>Fases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>Spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Volgende fase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <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="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>Next &amp;turn</source>
         <translation>Volgende beurt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>Reverse turn order</source>
         <translation>Keer beurtvolgorde om</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="303"/>
         <source>&amp;Remove all local arrows</source>
-        <translation>Verwijder alle plaatselijke pijlen</translation>
+        <translation>Verwijder alle lokale pijlen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <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="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="309"/>
         <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="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="312"/>
         <source>Game &amp;information</source>
         <translation>Spelgegevens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
         <source>Un&amp;concede</source>
-        <translation>Opgeven &amp;terugdraaien</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Geef op</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>Verlaat spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>Sluit opgeslagen spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Focus Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="331"/>
         <source>&amp;Say:</source>
         <translation>Zeg:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</source>
-        <translation>Geselecteerde kaarten</translation>
+        <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="338"/>
         <source>&amp;View</source>
         <translation>&amp;Bekijk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>Zichtbaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>Zwevend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
-        <translation>Reset indeling</translation>
+        <translation>Reset lay-out</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Opgeven</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>Opgeven ongedaan maken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Verlaat spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <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="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <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="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>Je bent uit het spel gegooid.</translation>
     </message>
@@ -8407,7 +8234,7 @@ Please enter a name:</source>
     <message>
         <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
-        <translation>Thuis</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -8612,7 +8439,7 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
         <source>Local file system</source>
-        <translation>Plaatselijk bestandssysteem</translation>
+        <translation>Lokaal bestandssysteem</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
@@ -8628,13 +8455,13 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
         <source>Rename</source>
-        <translation>Hernoemen</translation>
+        <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="317"/>
         <source>New folder</source>
-        <translation>Nieuwe map</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
@@ -8645,7 +8472,7 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
         <source>Open replays folder</source>
-        <translation>Open replays map</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
@@ -8660,128 +8487,127 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Get replay share code</source>
-        <translation>Ontvang replay-deelcode</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>Replay opzoeken met replay-deelcode</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
         <source>Rename local folder</source>
-        <translation>Hernoem plaatselijke map</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
         <source>Rename local file</source>
-        <translation>Hernoem plaatselijk bestand</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
         <source>New name:</source>
-        <translation>Nieuwe naam:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
         <source>Error</source>
-        <translation>Foutmelding</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
         <source>Rename failed</source>
-        <translation>Hernoemen mislukt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
         <source>Name of new folder:</source>
-        <translation>Naam van nieuwe map:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
         <source>Delete local file</source>
-        <translation>Verwijder plaatselijk bestand</translation>
+        <translation>Verwijder lokaal opgeslagen spel</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
         <source>Are you sure you want to delete the selected files?</source>
-        <translation>Weet je zeker dat je de geselecteerde bestanden wil verwijderen?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
         <source>Are you sure you want to delete the selected replays?</source>
-        <translation>Weet je zeker dat je de geselecteerde replays wil verwijderen?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
         <source>Failed to get code</source>
-        <translation>Ontvangen code mislukt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>Deze server ondersteund het delen van replays niet of deze staat het niet toe aan jou.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>Mislukt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
         <source>Could not get replay code</source>
-        <translation>Ontvangen replay-code niet gelukt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
         <source>Replay Share Code</source>
-        <translation>Replay-deelcode</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>Anderen kunnen deze code gebruiken om de replay aan hun lijst van serverreplays toe te voegen:
-%1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
         <source>Copy to clipboard</source>
-        <translation>Kopieer naar klembord</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
         <source>Replay share code</source>
-        <translation>Replay-deelcode</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
         <source>Replay code found</source>
-        <translation>Replay-code gevonden</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
         <source>Replay was added, or you already had access to it.</source>
-        <translation>Replay toegevoegd, of je had misschien al toegang tot deze.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
         <source>Replay code not found</source>
-        <translation>Replay-code niet gevonden</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
         <source>Failed to submit code</source>
-        <translation>Versturen code mislukt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
         <source>Unexpected error</source>
-        <translation>Onverwachte foutmelding</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
@@ -8791,7 +8617,7 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
         <source>Game Replays</source>
-        <translation>Spel-replays</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -8834,7 +8660,7 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
     <message>
         <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
-        <translation>Klik om weer te geven</translation>
+        <translation>Click om weer te geven</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
@@ -8883,67 +8709,67 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
         <source>Deck Editor</source>
-        <translation>Deckbewerker</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
         <source>Visual Deck Editor</source>
-        <translation>Visuele Deckbewerker</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
         <source>EDHRec</source>
-        <translation>EDHRec</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
         <source>Archidekt</source>
-        <translation>Archidekt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
         <source>Home</source>
-        <translation>Thuis</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
         <source>&amp;Visual Deck Storage</source>
-        <translation>&amp;Visuele Deckopslag</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
         <source>Visual Database Display</source>
-        <translation>Visuele Databaseweergave</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
         <source>Server</source>
-        <translation>Server</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
         <source>Account</source>
-        <translation>Account</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Storage</source>
-        <translation>Deckopslag</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Game Replays</source>
-        <translation>Spel-replays</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>Administration</source>
-        <translation>Beheer</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
         <source>Logs</source>
-        <translation>Logs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
@@ -9026,12 +8852,12 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
         <source>Database Display</source>
-        <translation>Databaseweergave</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
         <source>Visual Database Display</source>
-        <translation>Visuele Databaseweergave</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -9136,12 +8962,12 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
-        <translation>Voeg toe aan maatjeslijst</translation>
+        <translation>Voeg toe aan vriendenlijst</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
         <source>Remove from &amp;buddy list</source>
-        <translation>Verwijder uit maatjeslijst</translation>
+        <translation>Verwijder uit vriendenlijst</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
@@ -9201,29 +9027,29 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
         <source>View admin notes</source>
-        <translation>Bekijk adminnotities</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
-        <translation>Foutmelding</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
-        <translation>Deze gebruiker bestaat niet.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>Je wordt genegeerd door %1 en je kan diens spellen niet zien.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
         <source>Could not get %1&apos;s games.</source>
-        <translation>Kon %1&apos;s spellen niet ophalen.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
@@ -9277,7 +9103,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
         <source>Failed to get admin notes.</source>
-        <translation>Ontvangen adminnotities mislukt.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
@@ -9500,152 +9326,142 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>Algemene weergave-instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <source>&amp;Double-click cards to play them (instead of single-click)</source>
-        <translation>Dubbelklik op kaarten om ze te spelen (in plaats van enkele klik)</translation>
+        <translation>Dubbel-klik op kaarten om ze te spelen (in plaats van enkele klik)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <source>&amp;Clicking plays all selected cards (instead of just the clicked card)</source>
-        <translation>&amp;Klikken speelt alle geselecteerde kaarten (in plaats van allen de geklikte kaart)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <source>Do not delete &amp;arrows inside of subphases</source>
-        <translation>Verwijder &amp;pijlen niet binnen subphases</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <source>Close card view window when last card is removed</source>
-        <translation>Sluit kaartenweergavevenster wanner laatste kaart verwijderd is</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <source>Auto focus search bar when card view window is opened</source>
-        <translation>Focus zoekbalk onmiddelijk wanneer kaartenweergavevenster is geopent</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <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="968"/>
-        <source>Show selection counter during drag selection</source>
-        <translation>Geef selectieteller weer tijdens sleepselectie</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
-        <source>Show total selection counter</source>
-        <translation>Geef totale selectieteller weer</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>Notificatie instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <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="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Animatie-instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Tap/Untap animatie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
-        <translation>Deckbewerker/opslag instellingen</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <source>Open deck in new tab by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <source>Use visual deck storage in game lobby</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <source>Use selection animation for Visual Deck Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <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="973"/>
+        <source>do nothing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
+        <source>ask to convert to .cod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <source>always convert to .cod</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>Deck standaard in niewe tab openen</translation>
+        <source>Default deck editor type</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>Visuele deckopslag gebruiken in spelontvangstscherm</translation>
+        <source>Classic Deck Editor</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>Gebruik selectieanimatie voor Visuele Deckopslag</translation>
+        <source>Visual Deck Editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
+        <source>Replay settings</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>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="984"/>
-        <source>do nothing</source>
-        <translation>niks doen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
-        <source>ask to convert to .cod</source>
-        <translation>vragen om naar .cod om te zetten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
-        <source>always convert to .cod</source>
-        <translation>altijd omzetten naar .cod</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
-        <source>Default deck editor type</source>
-        <translation>Standaard deckbewerker soort</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
-        <source>Classic Deck Editor</source>
-        <translation>Klassieke Deckbewerker</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
-        <source>Visual Deck Editor</source>
-        <translation>Visuele Deckbewerker</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
-        <source>Replay settings</source>
-        <translation>Replayinstellingen</translation>
-    </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>
@@ -9709,24 +9525,23 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9753,108 +9568,25 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9862,32 +9594,22 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9923,7 +9645,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9931,19 +9653,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9951,37 +9673,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9995,22 +9707,52 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -10018,64 +9760,56 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10083,17 +9817,17 @@ 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="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10109,52 +9843,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10255,133 +9984,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <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="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <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="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <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="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <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="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation>Standaard volgorde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <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="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>Alle sets inschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>Alle sets uitschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <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="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
-        <translation>Deckbewerker</translation>
+        <translation>Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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 deckbewerker.</translation>
+        <translation>Alleen kaarten in de ingeschakelde sets zullen verschijnen in de kaartlijst van de deck editor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>Afbeelding</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="135"/>
         <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="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>Tips</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>Opmerking</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <source>To enable ordering again, click the column header until this message disappears.</source>
-        <translation>Om rangschikken weer mogelijk te maken, klik op de kop van de kolom totdat dit bericht verdwijnt.</translation>
+        <translation>Om de orderen weer mogelijk te maken, klikt u op de kop van de kolom totdat dit bericht verdwijnt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>Beheer sets</translation>
     </message>
@@ -10389,72 +10118,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</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="229"/>
         <source>Group by Type</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="230"/>
         <source>Group by Mana Value</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="231"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</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="239"/>
         <source>Sort by Name</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="240"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>Schudden bij afsluiten</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>Stapelweergave</translation>
     </message>
@@ -10489,9 +10218,9 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
-        <translation>Deckbewerker</translation>
+        <translation>Deck Editor</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
@@ -10570,7 +10299,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation>Replays</translation>
     </message>
@@ -10617,7 +10346,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
-        <translation>Start een Plaatselijk Spel...</translation>
+        <translation>Start een Lokaal Spel...</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
@@ -10722,9 +10451,9 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
-        <translation>Reset Indeling</translation>
+        <translation>Reset Lay-out</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
@@ -10759,7 +10488,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
         <source>Load Local Deck...</source>
-        <translation>Plaatselijk Deck Inladen...</translation>
+        <translation>Lokaal Deck Inladen...</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
@@ -11143,9 +10872,8 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <source>Toggle Untap</source>
+        <translation>Untap Omschakelen</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11164,102 +10892,98 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     </message>
     <message>
         <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>Kaart Bevestigen Aan...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>Kaart Losmaken</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>Copieer Kaart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>Maak Token...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>Maak Alle Gerelateerde Tokens</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>Maak Nog een Token</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>Zet Annotatie...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>Onderkant van Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Exile</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Graveyard</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Hand</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>Bovenkant van Library</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>Speelveld, Gesloten</translation>
     </message>
@@ -11295,246 +11019,234 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>Stack</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation>Graveyard (Meerdere)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation>Exile (Meerdere)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation>Stack Totdat Gevonden</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation>Trek Onderste Kaart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Trek Meerdere Kaarten van Onderkant...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>Trek Pijl...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
-        <translation>Verwijder Plaatselijke Pijlen</translation>
+        <translation>Verwijder Lokale Pijlen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>Verlaat Spel</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Opgeven</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>Werp Dobbelstenen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>Library Schudden</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>Trek een Kaart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>Trek Meerdere Kaarten...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>Kaart Trekken Ongedaan Maken</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>Altijd Bovenste Kaart Onthullen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>Altijd Bovenste Kaart Bekijken</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>Draai Weergave Met de Klok Mee</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Draai Weergave Tegen de Klok In</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>Textvak Verlaten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>Focus Naar Chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>Wis Chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>Verversen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation>Start/Stop</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation>Versnelling Schakelen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_pl.ts b/cockatrice/translations/cockatrice_pl.ts
index 236eff991..0085d6aae 100644
--- a/cockatrice/translations/cockatrice_pl.ts
+++ b/cockatrice/translations/cockatrice_pl.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,60 +36,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Ustawienia motywu</translation>
     </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>Current theme:</source>
         <translation>Obecny motyw:</translation>
     </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>Open themes folder</source>
         <translation>Otwórz folder motywów</translation>
     </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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation>Ustawienia menu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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="734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Rendering kart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <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="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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="748"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation>rzędy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>Układ ręki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <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="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Układ stołu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Odwróć współrzędne pionowe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maksymalny rozmiar czcionki dla informacji wyświetlanych na kartach</translation>
     </message>
@@ -300,12 +322,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +642,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -676,124 +693,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</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="439"/>
         <source>&amp;Select All</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="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -809,133 +826,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -997,7 +1014,7 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1028,32 +1045,32 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,17 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Uaktualnij Spoilery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Sukces</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <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="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <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="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>Dodaj URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>Edytuj URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <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="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <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="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <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="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>Dodaj Nowy URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>Usuń URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>Dni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Trwa aktualizacja...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Wybierz ścieżkę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>Priorytet Pobierania URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>Spoilery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>Pobierz spoilery automatycznie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>Lokalizacja spoilera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Ostatnia zmiana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <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="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <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="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <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="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>Usuń Pobrane Ilustracje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>Resetuj Pobieranie URLi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation>Pamięć podręczna na dysku dla pobranych obrazków</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <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>
     </message>
@@ -1467,32 +1484,32 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation>Ilość</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation>Dodatek</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Ilość</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation>Provider ID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Karta</translation>
     </message>
@@ -1528,12 +1545,12 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1750,32 +1767,32 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
         <translation>Biblioteka poboczna zablokowana</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2868,17 +2885,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Nieprawidłowa lista talii.</translation>
     </message>
@@ -2886,43 +2903,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2941,73 +2958,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <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="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation>Ilość trafień:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation>Automatycznie graj trafienia</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>Nieprawidłowy filtr</translation>
     </message>
@@ -3169,12 +3153,12 @@ Twój email zostanie użyty aby zweryfikować twoje konto.</translation>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3191,7 +3175,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3208,7 +3192,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3221,7 +3205,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3230,7 +3214,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3239,7 +3223,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3252,59 +3236,59 @@ 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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Ogólne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Wygląd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Interfejs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>Źródło Karty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Czat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Dźwięk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Skróty</translation>
     </message>
@@ -3618,67 +3602,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4126,143 +4110,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Wybierz ścieżkę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Ustawienia osobiste</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <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/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <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/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4270,47 +4254,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4318,88 +4302,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4407,52 +4391,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4460,213 +4444,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4768,8 +4732,18 @@ Will now login.</source>
 Rozpocznij logowanie.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Liczba graczy</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation>Wprowadź liczbę graczy.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Gracz %1</translation>
     </message>
@@ -4872,8 +4846,8 @@ Rozpocznij logowanie.</translation>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
@@ -5280,36 +5254,36 @@ Lokalna wersja to %1, wersja zdalna to %2.</translation>
         <translation>Pokaż/Ukryj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>Nowa Wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice zainstalowany</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>Baza kart</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5318,29 +5292,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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Otwórz ustawienia </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>Znaleziono nowe dodatki</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5355,17 +5329,17 @@ Kody dodatków: %1
 Czy chcesz je teraz uaktywnić?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>Pokaż dodatki</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Witaj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5374,64 +5348,64 @@ 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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Informacja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <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="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <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="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5442,55 +5416,55 @@ Prawdopodobnie nie jest to problem, ale ta wiadomośc może oznaczać że jest d
 Aby aktualizować klienta, otwórz okno Pomoc -&gt; Sprawdź Aktualizacje</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Wczytaj dodatki/karty</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation>Wybrany plik nie został znaleziony.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <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="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Dodatki/karty nie mogły być zaimportowane.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation>Zresetuj hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <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>
     </message>
@@ -5541,7 +5515,7 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5695,610 +5669,590 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>z gry</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation>z jego grobu</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation>ze strefy wygnania</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation>z jego ręki</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <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="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <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="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <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="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <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="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <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="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>z jego biblioteki</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation>z talii pobocznej</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation>ze stosu</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 poddał grę.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <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="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <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="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <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="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <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="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <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="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 niszczy %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>kartę</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="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>%1 przenosi kartę %2 do strefy wygnania %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <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="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <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="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <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="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <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="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <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="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <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="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <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="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <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="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <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="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 pokazuję kartę %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <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="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <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="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>odwrócone</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>normalne</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>Orzeł</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>Reszka</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>Tura gracza %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</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="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</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="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <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="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <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="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <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="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 tapuje swoje permanenty.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 odtapowuje swoje permanenty.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 tapuje kartę %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 odtapowuje kartę %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 tasuje %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 odczepia kartę %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <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="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 cofa ostatnią dobraną kartę (%2)</translation>
     </message>
@@ -6306,110 +6260,110 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>Wyraz1 Wyraz2 Wyraz3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>Dodaj Nową Wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>Edytuj Wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation>Usuń Wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Dodaj wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Wiadomość:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>Edytuj wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>Ustawienia czatu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>Niestandardowy tekst alertu.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <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="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <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="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <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="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <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="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>Odwróć kolor tekstu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <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="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <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="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <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="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(Kolor w kodzie heksadecymalnym)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Rozdziel słowa spacją, tylko alfanumeryczne znaki</translation>
     </message>
@@ -6422,37 +6376,32 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6594,57 +6543,57 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Krok odtapowania</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Krok utrzymania</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Krok dobierania</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>Pierwsza faza główna</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Krok początku walki</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Krok deklaracji atakujących</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Krok deklaracji broniących</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Krok obrażeń bitewnych</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Krok zakończenia walki</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>Druga faza główna</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Krok końca tury</translation>
     </message>
@@ -6661,138 +6610,134 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6800,65 +6745,48 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation>Przypnij wersję</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation>Odepnij wersję</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation>Pokaż powiązane karty</translation>
     </message>
@@ -6907,25 +6835,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation>Data wydania</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation>Malejąco</translation>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7064,33 +6984,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7239,37 +7132,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7312,14 +7205,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>Gry</translation>
     </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>
@@ -7384,53 +7269,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <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="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <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="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>Sekcja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>Akcja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>Skrót:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <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="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation>Wyczyść wszystkie skróty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation>Szukaj po nazwie skrótu</translation>
     </message>
@@ -7499,27 +7384,27 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <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="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <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="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <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="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>Ustawienia dźwięku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>Główne ustawienia głośności</translation>
     </message>
@@ -7735,123 +7620,59 @@ Sprawdź ustawienia skrótów!</translation>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7859,52 +7680,60 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>Informacje o karcie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>Talia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>Filtry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;Widok</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation>Wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>Widoczne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>Pływające</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>Resetuj układ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Talia: %1</translation>
     </message>
@@ -7912,55 +7741,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -8025,7 +7860,7 @@ Sprawdź ustawienia skrótów!</translation>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>Nowy folder</translation>
     </message>
@@ -8107,18 +7942,18 @@ Wprowadź nazwę:</translation>
         <translation>Czy na pewno chcesz usunąć wybrane pliki?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation>Usuń zdalną talię</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Nazwa nowego folderu:</translation>
     </message>
@@ -8136,12 +7971,12 @@ Wprowadź nazwę:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8190,191 +8025,197 @@ Wprowadź nazwę:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>Powtórka</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>Gra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>Lista Graczy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>Informacje o karcie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</source>
         <translation>Wiadomości</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>Oś czasu powtórki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>&amp;Fazy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>&amp;Gra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Następna &amp;faza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <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="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>Next &amp;turn</source>
         <translation>Następna &amp;tura</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>Reverse turn order</source>
         <translation>Odwróć kolejność 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="303"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <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="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="309"/>
         <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="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="312"/>
         <source>Game &amp;information</source>
         <translation>&amp;Informacje o grze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
         <source>Un&amp;concede</source>
         <translation>Powróć do gry</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Poddaj grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Opuść grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;Zamknij powtórkę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</source>
         <translation>Skup czat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;Powiedz:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation>&amp;Widok</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>Widoczne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>Pływające</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>Resetuj układ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Poddaj grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>Powróć do gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Opuść grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <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="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <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="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>Wyrzucono cię z gry.</translation>
     </message>
@@ -9474,152 +9315,142 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>Ogólne ustawienia interfejsu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <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="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>Ustawienia powiadomień</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <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="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Ustawienia animacji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>Animacja &amp;tapowania/odtapowania</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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="979"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation>Ustawienia powtórek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Buforuj czas do przeskoku w tył wywołane przez skrót:</translation>
     </message>
@@ -9683,24 +9514,23 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9727,108 +9557,25 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9836,32 +9583,22 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9897,7 +9634,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9905,19 +9642,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9925,37 +9662,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9969,22 +9696,52 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9992,64 +9749,56 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10057,17 +9806,17 @@ 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="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10083,52 +9832,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10229,133 +9973,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <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="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <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="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <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="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <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="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation>Domyślna kolejność</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <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="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>Włącz wszystkie dodatki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>Wyłącz wszystkie dodatki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <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="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>Edycja Talii</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>Obraz karty</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="135"/>
         <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="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>Wskazówki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>Notatka</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>Zarządzaj dodatkami</translation>
     </message>
@@ -10363,72 +10107,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</source>
         <translation>Niepogrupowane</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Group by Type</source>
         <translation>Grupuj po typie</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <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="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Color</source>
         <translation>Grupuj po kolorze</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</source>
         <translation>Nieposortowane</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Sort by Name</source>
         <translation>Sortuj według nazwy</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Type</source>
         <translation>Sortuj według typu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <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="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation>Sortuj według koloru</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <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="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation>Sortuj według dodatku</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>przetasuj przy zamykaniu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>widok sterty</translation>
     </message>
@@ -10463,7 +10207,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>Edycja Talii</translation>
     </message>
@@ -10544,7 +10288,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation>Powtórki</translation>
     </message>
@@ -10696,7 +10440,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>Zresetuj wygląd</translation>
     </message>
@@ -11117,9 +10861,8 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <source>Toggle Untap</source>
+        <translation>Odtapuj</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11138,102 +10881,98 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
     </message>
     <message>
         <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>Dołącz Kartę..</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>Odłącz Kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>Sklonuj Kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>Utwórz token…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>Stwórz Wszystkie Pokrewne Tokeny</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>Stwórz Kolejny Token</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>Ustaw Adnotację…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation>Zaznacz Wszystkie Karty w Strefie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation>Zaznacz Wszystkie Karty w Rzędzie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation>Zaznacz Wszystkie Karty w Kolumnie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>Dno biblioteki</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Wygnanie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Grób</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Ręka</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>Wierzch biblioteki</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>Pole Bitwy, Koszulką do Góry</translation>
     </message>
@@ -11269,246 +11008,234 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>Stos</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation>Cmentarz (Wiele)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation>Wygnanie (Wiele)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation>Stos aż do Znalezienia</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation>Dobierz Kartę z Dna</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Dobierz Wiele Kart z Dna...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>Narysuj wskaźnik...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation>Usuń Lokalne Wskaźniki</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>Opuść Grę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Poddanie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>Rzuć Kośćmi...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>Potasuj Bibliotekę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>Dobierz Kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>Dobierz Wiele Kart...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>Cofnij Dobranie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>Zawsze Odkrywaj Górną Kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>Zawsze Patrz na Górną Kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>Obróć widok zgodnie z ruchem wskazówek zegara</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Obróć widok przeciwnie do ruchu wskazówek zegara</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>Nie skupiaj Tekstu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>Skup Czat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>Wyczyść czat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>Odśwież</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation>Przeskocz do Przodu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation>Przeskocz do Tyłu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation>Bardzo Przeskocz do Przodu </translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation>Bardzo Przeskocz do Tyłu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation>Odtwórz/Pauza</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation>Przełącz przyspieszenie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_pt.ts b/cockatrice/translations/cockatrice_pt.ts
index f67c8d138..c2624e6d5 100644
--- a/cockatrice/translations/cockatrice_pt.ts
+++ b/cockatrice/translations/cockatrice_pt.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,60 +36,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Definições do Tema</translation>
     </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>Current theme:</source>
         <translation>Tema actual:</translation>
     </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>Open themes folder</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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Rendering da carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>Disposição da Mão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <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="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Esquema da mesa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Inverter coordenada vertical</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"/>
     </message>
@@ -300,12 +322,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +642,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -676,124 +693,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</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="439"/>
         <source>&amp;Select All</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="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -809,133 +826,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -997,7 +1014,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1028,32 +1045,32 @@ 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/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,17 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</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="1284"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1467,32 +1484,32 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Número</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Carta</translation>
     </message>
@@ -1528,12 +1545,12 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1750,32 +1767,32 @@ 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/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2867,17 +2884,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Lista de deck inválida.</translation>
     </message>
@@ -2885,43 +2902,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2940,73 +2957,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3167,12 +3151,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3189,7 +3173,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3206,7 +3190,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3215,7 +3199,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3224,7 +3208,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3233,7 +3217,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3242,59 +3226,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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Definições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Aparência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Interface do utilizador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Atalhos</translation>
     </message>
@@ -3607,67 +3591,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4115,143 +4099,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Escolher directório</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Defenições pessoais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <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/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <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/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4259,47 +4243,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4307,88 +4291,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4396,52 +4380,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4449,213 +4433,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4755,8 +4719,18 @@ Will now login.</source>
 Entrará agora.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Número de jogadores</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <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="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Jogador %1</translation>
     </message>
@@ -4859,8 +4833,8 @@ Entrará agora.</translation>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
@@ -5265,34 +5239,34 @@ Versão local é %1, versão remota é %2.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>Base de dados de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5301,110 +5275,110 @@ 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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Abrir definições</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>Novas expansões foram encontradas</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <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="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>Ver expansões</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Bem-vindo/a</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <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="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <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="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5412,55 +5386,55 @@ 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="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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Carregar expansões/cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <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="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Falha na importação de expansões/cartas.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
@@ -5511,7 +5485,7 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5665,610 +5639,590 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>do jogo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation>do seu cemitério</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation> vindo do exílio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation>da sua mão</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <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="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <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="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <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="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <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="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <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="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>dos seus grimórios</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation> do sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation> da pilha</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <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="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <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="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <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="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <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="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <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="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 destrói %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>uma carta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="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>%1 exila %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 joga %2%3.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <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="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>O jogo começou.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <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="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <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="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <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="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <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="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 revela %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <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="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 revela %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>Cara</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>Coroa</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>Turno de %1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <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="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <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="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <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="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <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="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <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="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 vira %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 desvira %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 baralha %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 desanexa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <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="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 desfaz a sua última compra (%2).</translation>
     </message>
@@ -6276,110 +6230,110 @@ 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="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Adicionar mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Mensagem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>Definições do Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>Palavras alerta personalizáveis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>Permitir menções no chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <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="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <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="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>Inverter cor do texto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <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="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <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="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <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="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(A cor é hexadecimal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Palavras separadas com espaço, apenas caracteres alfanuméricos</translation>
     </message>
@@ -6392,37 +6346,32 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6564,57 +6513,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="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Etapa de Desvirar</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Etapa de manutenção</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Etapa de compra</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>1ª Fase Principal (pré-combate)</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Etapa de Início de Combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Etapa de Declaração de Atacantes</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Etapa de Declaração de Bloqueadores</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Etapa de Dano de Combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Etapa de Fim de Combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>2ª Fase Principal (pós-combate)</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Fase Final</translation>
     </message>
@@ -6631,138 +6580,134 @@ 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="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6770,65 +6715,48 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6877,25 +6805,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7034,33 +6954,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7209,37 +7102,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7282,14 +7175,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>Jogos</translation>
     </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>
@@ -7354,53 +7239,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7467,27 +7352,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>Permitir &amp;sons</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>Tema sonoro actual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <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="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>Definições de Som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>Volume mestre</translation>
     </message>
@@ -7703,123 +7588,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7827,52 +7648,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>Informação da carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>Baralho</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>Flutuando</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>Repor disposição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Deck:%1</translation>
     </message>
@@ -7880,55 +7709,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7993,7 +7828,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>Nova pasta</translation>
     </message>
@@ -8075,18 +7910,18 @@ Por favor introduza um nome:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Nome da nova pasta:</translation>
     </message>
@@ -8104,12 +7939,12 @@ Por favor introduza um nome:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8158,191 +7993,197 @@ Por favor introduza um nome:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>Repetição</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>Informação da carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</source>
         <translation>Mensagens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>Repetir Cronologia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>Fa&amp;ses</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>&amp;Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Próxima &amp;fase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</source>
         <translation>Próximo &amp;turno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>Reverse turn order</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="303"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <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="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="309"/>
         <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="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="312"/>
         <source>Game &amp;information</source>
         <translation>&amp;Informação do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>Sair do &amp;jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;Fechar replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;Dizer:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>Flutuando</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>Repor disposição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Sair do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the 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="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>Foi expulso do jogo.</translation>
     </message>
@@ -9438,152 +9279,142 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>Configurações gerais da interface</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <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="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <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="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Configurações de Animações</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <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="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9647,24 +9478,23 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9691,108 +9521,25 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9800,32 +9547,22 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9861,7 +9598,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9869,19 +9606,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9889,37 +9626,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9933,22 +9660,52 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9956,64 +9713,56 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10021,17 +9770,17 @@ 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="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10047,52 +9796,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10193,133 +9937,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <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="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <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="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <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="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <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="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <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="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <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="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</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="135"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10327,72 +10071,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</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="229"/>
         <source>Group by Type</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="230"/>
         <source>Group by Mana Value</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="231"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</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="239"/>
         <source>Sort by Name</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="240"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>baralhar quando terminar</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>vista em pilha</translation>
     </message>
@@ -10427,7 +10171,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>Editor de Baralhos</translation>
     </message>
@@ -10508,7 +10252,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -10660,7 +10404,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
@@ -11081,8 +10825,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -11102,102 +10845,98 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
     </message>
     <message>
         <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="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Exílio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Cemitério</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Mão</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</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="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
@@ -11233,246 +10972,234 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Desistir</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_pt_BR.ts b/cockatrice/translations/cockatrice_pt_BR.ts
index 9956c1793..4a2548812 100644
--- a/cockatrice/translations/cockatrice_pt_BR.ts
+++ b/cockatrice/translations/cockatrice_pt_BR.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Atualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Analisar nome e número do conjunto (se disponível)</translation>
     </message>
@@ -36,62 +36,62 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <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="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation>Você tem certeza?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation>Salvar deck</translation>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <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>
@@ -133,168 +133,196 @@ Por favor, verifique se a pasta não é somente leitura e tente novamente.</tran
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation>segundos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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>Habilitar essa funcionalidade desabilita o uso do Selecionador de Impressões.
+
+Você não será capaz de gerenciar preferências de impressões por decks e nem ver impressões que outros jogadores escolheram para os decks deles.
+
+Você deverá usar o Gerenciador de Coleção, disponível via Banco de Dados de Cartas -&gt; Gerenciar Coleções.
+
+Tem certeza de que quer habilitar essa funcionalidade?</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation>Confirmar Alteração</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Configurações de Tema</translation>
     </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>Current theme:</source>
         <translation>Tema atual:</translation>
     </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>Open themes folder</source>
         <translation>Abra a pasta de temas</translation>
     </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>Home tab background source:</source>
         <translation>Fonte do background da tab Home:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <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="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation>Desabilitado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation>Configurações do Menu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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="734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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/dialogs/dlg_settings.cpp" line="736"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Renderização das cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <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="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <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="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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="748"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation>linhas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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="752"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation>Marcadores de carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</source>
         <translation>Marcador %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
         <source>Hand layout</source>
         <translation>Organização da mão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>Habilitada justificação à esquerda</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <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="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Inverter a coordenada vertical</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Tamanho máximo da fonte para informações nas cartas:</translation>
     </message>
@@ -302,12 +330,7 @@ Por favor, verifique se a pasta não é somente leitura e tente novamente.</tran
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation>Abrir no Editor de Decks</translation>
     </message>
@@ -627,22 +650,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation>Visualizar cartas relacionadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <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="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation>Main</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation>Side</translation>
     </message>
@@ -678,124 +701,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation>Revelar para...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation>Todos os &amp;jogadores</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation>Visualizar cartas relacionadas</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation>Ficha:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</source>
         <translation>Todas as fichas</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="439"/>
         <source>&amp;Select All</source>
         <translation>&amp;Marque todos</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="440"/>
         <source>S&amp;elect Row</source>
         <translation>Selecionar Linha</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation>Selecionar Coluna</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation>&amp;Jogar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation>&amp;Ocultar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation>Jogue &amp;virada para baixo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <source>&amp;Tap / Untap</source>
         <extracomment>Turn sideways or back again</extracomment>
         <translation>&amp;Virar / Desvirar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <source>T&amp;urn Over</source>
         <extracomment>Turn face up/face down</extracomment>
         <translation>&amp;Virar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation>&amp;Olhar a face da carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation>&amp;Clonar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation>Ane&amp;xar na carta...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation>De&amp;sanexar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation>&amp;Desenhar seta...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation>Colocar &amp;nota...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation>Marcadores de carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation>&amp;Adicionar marcador(%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Remover marcador (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>&amp;Definir marcadores (%1)...</translation>
     </message>
@@ -811,133 +834,133 @@ 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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>sua mão</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation>mão de %1</translation>
     </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="180"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation>seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation>grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation>do seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation>do grimório de %1</translation>
     </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation>seu grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <source>%1&apos;s library</source>
+        <comment>reveal zone</comment>
+        <translation>grimório de %1</translation>
+    </message>
     <message>
         <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <source>their library</source>
-        <comment>reveal zone</comment>
-        <translation>seu grimório</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
-        <source>%1&apos;s library</source>
-        <comment>reveal zone</comment>
-        <translation>grimório de %1</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation>seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation>grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation>grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>seu cemitério</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation>cemitério de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>seu exílio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation>exílio de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation>seu sideboard</translation>
     </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="201"/>
+        <source>%1&apos;s sideboard</source>
+        <comment>look at zone</comment>
+        <translation>sideboard de %1</translation>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</comment>
+        <translation>seu sideboard</translation>
+    </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>sideboard de %1</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
-        <source>their sideboard</source>
-        <comment>nominative</comment>
-        <translation>seu sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
-        <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation>sideboard de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation>sua zona customizada &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>zona customizada &apos;%2&apos; de %1</translation>
@@ -999,7 +1022,7 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation>Banco de Dados de Cartas</translation>
     </message>
@@ -1007,7 +1030,7 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Informações da carta</translation>
     </message>
@@ -1030,32 +1053,32 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
         <translation>Adicionar ao Sideboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <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="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <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="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Adicionar carta ao &amp;sideboard</translation>
     </message>
@@ -1063,32 +1086,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <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="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
-        <translation>Cores</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation>Escolher Impressão</translation>
     </message>
@@ -1125,12 +1148,12 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
     <message>
         <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
         <source>Group by:</source>
-        <translation>Agrupar por:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Format:</source>
-        <translation>Formato:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
@@ -1161,17 +1184,17 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <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="140"/>
         <source>&amp;Clear all filters</source>
         <translation>&amp;Limpar todos os filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation>Apagar selecionados</translation>
     </message>
@@ -1258,7 +1281,7 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
     <message>
         <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
         <source>Load deck from online service...</source>
-        <translation>Carregar baralho de serviço online...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
@@ -1294,7 +1317,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation>Seletor de Impressão</translation>
     </message>
@@ -1302,166 +1325,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Atualizar Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Sucesso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <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="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <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="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>Adicionar URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>Editar URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation>Tamanho do Cache de Rede:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation>TTL do Cache de Redirecionamento:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation>Tamanho do Cache de Imagens:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>Adicionar nova URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>Remover URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>Dia(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Atualizando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Selecione o caminho</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>Prioridade de download de URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>&apos;Spoilers&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>Baixar &apos;spoilers&apos; automaticamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>Localização do &apos;spoiler&apos;:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Última Alteração</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <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="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <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="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <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="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>Deletar imagens baixadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>Resetar URLs de download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation>Cache em disco para imagens baixadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <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>
     </message>
@@ -1469,60 +1492,60 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
-        <translation>Desfazer</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Redo</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>Refazer</translation>
+        <source>Undo/Redo history</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>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
-        <translation>[refazer]</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
-        <translation>[desfazer]</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation>Contagem</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation>Conjunto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Número</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation>ID do Provedor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Card</translation>
     </message>
@@ -1530,12 +1553,12 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation>Formatos de decks comuns (%1)</translation>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation>Todos arquivos (*.*)</translation>
     </message>
@@ -1601,7 +1624,7 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
     <message>
         <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>Edit default tags</source>
-        <translation>Editar tags padrão</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
@@ -1632,94 +1655,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <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="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <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="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <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="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation>Anotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <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="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <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="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <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="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <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="488"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <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="415"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation>Falha ao deletar</translation>
     </message>
@@ -1729,12 +1752,12 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
     <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>
+        <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>Comentários atualizados (eram %1 caracteres, agora são %2 caracteres)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
@@ -1744,42 +1767,42 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
     <message>
         <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
         <source>Tags changed</source>
-        <translation>Tags alteradas</translation>
+        <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>Definir formato para %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <source>Added (%1): %2 (%3) %4</source>
-        <translation>Adicionado (%1): %2 (%3) %4</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation>Movido para %1 1 × &quot;%2&quot; (%3)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation>Removido &quot;%1&quot; (todas as cópias)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation>%1 1 × &quot;%2&quot; (%3)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
-        <translation>Adicionado</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
-        <translation>Removido</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1811,12 +1834,12 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
-        <translation>Carregado da área de transferência...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
-        <translation>Carregado do website...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
@@ -1844,30 +1867,29 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
         <translation>Sideboard fechado</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
-        <translation>O baralho é maior que o tamanho máximo de arquivo.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <source>Are you sure you want to force start?
 This will kick all non-ready players from the game.</source>
-        <translation>Tem certeza que deseja forçar o início?
-Isso irá expulsar todos os jogadores não preparados do jogo.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -2128,12 +2150,12 @@ Deseja converter o deck para .cod?</translation>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
         <source>Open decklists in lobby</source>
-        <translation>Abrir lista de baralhos no lobby</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
@@ -2269,53 +2291,53 @@ Deseja converter o deck para .cod?</translation>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
-        <translation>Editar Tags</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
-        <translation>Adicionar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
-        <translation>Confirmar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
         <source>Enter a tag and press Enter</source>
-        <translation>Insira a tag e aperte Enter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>✖</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
-        <translation>Valor Inválido</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
-        <translation>Nomes de tags não podem ser vazios!</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
         <source>Duplicate Tag</source>
-        <translation>Tag Duplicada</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
         <source>This tag already exists.</source>
-        <translation>Essa tag já existe.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2362,17 +2384,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <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="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation>Decklist inválida.</translation>
     </message>
@@ -2601,7 +2623,7 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
         <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
@@ -2873,17 +2895,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Lista de deck inválida.</translation>
     </message>
@@ -2891,43 +2913,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
-        <translation>Carregar Baralho de Website</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
-        <translation>Erro de rede: %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2946,73 +2968,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <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="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <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="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation>Reproduzir resultados automaticamente</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>Filtro inválido</translation>
     </message>
@@ -3133,12 +3122,12 @@ Seu e-mail será utilizado para verificar sua conta.</translation>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
-        <translation>Cartas não modificadas:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
-        <translation>Cartas Modificadas:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
@@ -3174,12 +3163,12 @@ Seu e-mail será utilizado para verificar sua conta.</translation>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3196,7 +3185,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3213,7 +3202,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3226,7 +3215,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3235,7 +3224,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3244,7 +3233,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3257,59 +3246,59 @@ 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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Aparência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Interface do usuário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>Fonte de Cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Conversa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Atalhos</translation>
     </message>
@@ -3319,7 +3308,7 @@ Você gostaria de alterar seu local de configuração do banco de dados?</transl
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
-        <translation>Checar Atualização de Carta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
@@ -3351,7 +3340,7 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
-        <translation>Não executar desta vez</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3548,7 +3537,7 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
     <message>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
@@ -3566,126 +3555,126 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
     <message>
         <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>
+        <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>Nome da Carta</translation>
+        <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>Tipo</translation>
+        <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>Subtipo</translation>
+        <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>Valor de mana</translation>
+        <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>Exatidão</translation>
+        <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>Pelo menos</translation>
+        <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>Exatamente</translation>
+        <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>Quantidade (N):</translation>
+        <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>Cartas compradas (M):</translation>
+        <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>
+        <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"/>
+        <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <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="104"/>
+        <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>
+        <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>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation>Subtipo</translation>
+        <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>Mana Value</source>
-        <translation>Valor de Mana</translation>
+        <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="109"/>
-        <source>At least</source>
-        <translation>Pelo menos</translation>
+        <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>Exactly</source>
-        <translation>Exatamente</translation>
-    </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"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
         <source>cards</source>
-        <translation>cartas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Category</source>
-        <translation>Categoria</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Qty</source>
-        <translation>Qtd</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
-        <translation>Chances (%)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3716,7 +3705,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>Mercado de Cartas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
@@ -3770,7 +3759,7 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
     <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>Orçamento</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3778,7 +3767,7 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
     <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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
@@ -3807,7 +3796,7 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
-        <translation>Confirmar Exclusão</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
@@ -3817,12 +3806,12 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
-        <translation>Falha na Exclusão</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>Falha ao remover filtro &apos;%1&apos;.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3835,17 +3824,17 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
     <message>
         <location filename="src/game/game_event_handler.cpp" line="415"/>
         <source>player left the game</source>
-        <translation>jogador saiu do jogo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/game_event_handler.cpp" line="418"/>
         <source>player disconnected from server</source>
-        <translation>jogador desconectado do servidor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/game_event_handler.cpp" line="422"/>
         <source>reason unknown</source>
-        <translation>motivo desconhecido</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3921,7 +3910,7 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
         <source>Join Game as Judge</source>
-        <translation>Entrar no Jogo como Juíz</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
@@ -4131,143 +4120,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Escolher caminho</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Configurações pessoais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Idioma:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>Caminhos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4275,47 +4264,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4323,88 +4312,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4412,52 +4401,52 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4465,213 +4454,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4771,8 +4740,18 @@ Will now login.</source>
 Irá entrar agora.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Número de jogadores</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <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="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Jogador %1</translation>
     </message>
@@ -4875,8 +4854,8 @@ Irá entrar agora.</translation>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
@@ -5284,36 +5263,36 @@ A versão local é %1 e a versão remota é %2.</translation>
         <translation>Mostrar/Ocultar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>Nova Versão</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice instalado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>Base de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5322,29 +5301,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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Abrir configurações</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>Novas expansões encontradas</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5357,17 +5336,17 @@ Códigos das coleções: %1
 Deseja ativá-las?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>Visualizar expansões</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Bem vindo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5376,64 +5355,64 @@ 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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <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="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <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="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5444,55 +5423,55 @@ Provavelmente não é um problema, mas esta mensagem pode significar que existe
 Para atualizar seu cliente, vá para Ajuda -&gt; Verificar atualizações.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Carregar expansões/cards</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <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="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <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="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Falha ao importar expansões/cartas.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation>Redefinir Senha</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <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>
     </message>
@@ -5543,7 +5522,7 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5697,610 +5676,590 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>do jogo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation>do seu cemitério</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation> vindo do exílio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation>da sua mão</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <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="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <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="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <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="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <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="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <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="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>do seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation> vindo do sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation> vindo da pilha</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <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="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <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="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <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="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <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="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <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="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <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="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 destrói %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>um card</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="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>%1 exila %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation>de fundo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation>de topo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <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="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <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="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <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="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>O jogo começou.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <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="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <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="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <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="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <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="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <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="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 revela %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <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="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 revela %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>revertido</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>Cara</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>Coroa</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>Turno de %1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <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="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <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="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <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="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <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="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <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="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <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="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 vira suas permanentes.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 desvira suas permanentes.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 vira %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 desvira %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 embaralha %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 desanexa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <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="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 desfaz sua última compra (%2).</translation>
     </message>
@@ -6308,110 +6267,110 @@ 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="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>Palavra1 Palavra2 Palavra3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>Adicionar nova mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>Editar mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation>Remover mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Adicionar mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Mensagem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>Editar mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>Configurações de Conversa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>Palavras de alertas customizadas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>Habilitar menções em conversa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>Habilitar completador de menções.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation>Mensagem no jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <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="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <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="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>Inverter cor do texto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <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="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <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="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <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="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(Cor em hexadecimal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separar palavras com um espaço, apenas caracteres alfanuméricos</translation>
     </message>
@@ -6424,37 +6383,32 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6596,57 +6550,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="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Etapa de desvirar</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Etapa de manutenção</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Etapa de compra</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>Primeira fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Etapa de início de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Etapa de declaracão de atacantes</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Etapa de declaração de bloqueadores</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Etapa de dano de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Etapa de fim de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>Segunda fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Etapa de fim de combate</translation>
     </message>
@@ -6663,138 +6617,134 @@ 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="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6802,65 +6752,48 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation>Preferência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <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="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <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="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation>Mostrar Cartas Relacionadas</translation>
     </message>
@@ -6909,25 +6842,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation>Data de Lançamento</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation>Decrescente</translation>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7066,33 +6991,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7241,37 +7139,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7314,14 +7212,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>Jogos</translation>
     </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>
@@ -7386,53 +7276,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <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="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <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="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>Seção:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>Ação:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>Atalho:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <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="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation>Limpar todos os atalhos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation>Pesquisar pelo nome do atalho</translation>
     </message>
@@ -7501,27 +7391,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="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>Habilitar &amp;sons</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>Tema sonoro atual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation>Testar sistema de som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>Configurações de som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>Volume principal</translation>
     </message>
@@ -7737,123 +7627,59 @@ Por favor, verifique suas configurações de atalho!</translation>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7861,52 +7687,60 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>Informação da carta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation>Impressão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>Flutuante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>Reiniciar layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Deck: %1</translation>
     </message>
@@ -7914,55 +7748,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -8027,7 +7867,7 @@ Por favor, verifique suas configurações de atalho!</translation>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>Nova pasta</translation>
     </message>
@@ -8109,18 +7949,18 @@ Por favor, entre um nome:</translation>
         <translation>Tem certeza de que deseja excluir os arquivos selecionados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation>Excluir decks remotos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Nome da nova pasta:</translation>
     </message>
@@ -8138,12 +7978,12 @@ Por favor, entre um nome:</translation>
         <translation>Decks Visuais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8192,191 +8032,197 @@ Por favor, entre um nome:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>Replay</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>Lista de jogadores.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>Informação da carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</source>
         <translation>Mensagens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>Linha do tempo do Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>&amp;Etapas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>&amp;Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Próxima &amp;etapa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <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="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>Next &amp;turn</source>
         <translation>Próximo &amp;turno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>Reverse turn order</source>
         <translation>Ordem dos turnos revertida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="303"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <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="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="309"/>
         <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="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="312"/>
         <source>Game &amp;information</source>
         <translation>&amp;Informação de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
         <source>Un&amp;concede</source>
         <translation>Cancelar Rendição</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Sair do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;Fechar replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Focar no chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;Falar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>Flutuante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>Reiniciar layout </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>Defazer concessão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Sair do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <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="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <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="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>Você foi &apos;chutado&apos; do jogo.</translation>
     </message>
@@ -9478,152 +9324,142 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>Configurações gerais de interface</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <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="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>Configurações de Notificações</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <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="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Configurações de animação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <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="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <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="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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="979"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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="980"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation>Configurações de repetição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Tempo de buffer para retroceder usando atalho:</translation>
     </message>
@@ -9687,24 +9523,23 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9731,108 +9566,25 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9840,32 +9592,22 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9901,7 +9643,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9909,19 +9651,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9929,37 +9671,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9973,22 +9705,52 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9996,64 +9758,56 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10061,17 +9815,17 @@ 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="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10087,52 +9841,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10233,133 +9982,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <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="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <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="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <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="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <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="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation>Ordem padrão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <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="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>Habilitar todas expansões</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>Desabilitar todas expansões</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <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="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>Editor de Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>Arte da Carta</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="135"/>
         <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="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>Dicas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>Gerenciar expansões</translation>
     </message>
@@ -10367,72 +10116,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</source>
         <translation>Não agrupado</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Group by Type</source>
         <translation>Agrupar por Tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <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="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Color</source>
         <translation>Agrupar por Cor</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</source>
         <translation>Não ordenado</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Sort by Name</source>
         <translation>Ordenar por Nome</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Type</source>
         <translation>Ordenar por Tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <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="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation>Ordenar por Cores</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation>Ordenar por P/T</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation>Ordenar por Conjunto</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>embaralhar quando fechar</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>visualização da pilha</translation>
     </message>
@@ -10467,7 +10216,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>Editor de Deck</translation>
     </message>
@@ -10548,7 +10297,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation>Repetições</translation>
     </message>
@@ -10700,7 +10449,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>Redefinir layout</translation>
     </message>
@@ -11121,9 +10870,8 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <source>Toggle Untap</source>
+        <translation>Alternar modo de desvirar</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11142,102 +10890,98 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
     </message>
     <message>
         <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>Anexar carta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>Desanexar carta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>Duplicar Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>Criar Ficha</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>Criar todas as fichas relacionadas</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>Criar Outra Ficha</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>Definir anotação</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation>Selecionar Todas as Cartas na Zona</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation>Selecionar Todas as Cartas na Linha</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation>Selecionar Todas as Cartas na Coluna</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>Fundo do Grimório</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Exilar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Cemitério</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Mão</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>Topo do Grimório</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>Campo de batalha, Voltada para baixo</translation>
     </message>
@@ -11273,246 +11017,234 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>Pilha</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation>Cemitério (Vários)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation>Exílio (Vários)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation>Empilhar Até Encontrar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation>Comprar carta do fundo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Comprar várias cartas do fundo...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>Desenhar seta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation>Remover setas locais</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>Sair do jogo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>Rolar dados...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>Embaralhar grimório</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>Comprar uma carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>Comprar várias cartas</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>Desfazer compra</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>Sempre revelar a carta do topo do grimório</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>Sempre olhar para a carta do topo do grimório</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>Rotacionar visão no sentido horário</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Rotacionar visão no sentido anti-horário</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>Desfocar caixa de texto</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>Focar no chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>Limpar chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>Atualizar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation>Avançar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation>Retroceder</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation>Avançar Bastante</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation>Retroceder Bastante</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation>Reproduzir/Pausar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation>Ativar/Desativar Avanço Rápido</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation>Decks Visuais</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation>Armazenamento de Deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation>Administração</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation>Registros</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_ru.ts b/cockatrice/translations/cockatrice_ru.ts
index e666bf0de..8f062c706 100644
--- a/cockatrice/translations/cockatrice_ru.ts
+++ b/cockatrice/translations/cockatrice_ru.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Распознать имя сета и номер (если есть)</translation>
     </message>
@@ -36,62 +36,62 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation>Открыть в новой вкладке</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation>Вы уверены?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation>Сохранить колоду</translation>
     </message>
     <message>
-        <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="384"/>
         <source>The deck could not be saved.</source>
         <translation>Не удалось сохранить колоду.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation>В колоде нет карт для экспорта</translation>
     </message>
@@ -133,168 +133,202 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation>секунд</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation>Подтвердить изменения</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Настройки темы</translation>
     </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>Current theme:</source>
         <translation>Текущая тема:</translation>
     </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>Open themes folder</source>
         <translation>Открыть папку с темами</translation>
     </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>Home tab background source:</source>
         <translation>Путь до обоев на домашней вкладке:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation>Частота смены обоев:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation>Отключено</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation>Настройки меню</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>Отображать сочетания клавиш в контекстном меню</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Отрисовка карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <source>Display card names on cards having a picture</source>
         <translation>Отображать название карты поверх изображения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>Автоматически поворачивать карты альбомной ориентации </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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="742"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <source>Scale cards on mouse over</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="745"/>
         <source>Use rounded card corners</source>
         <translation>Использовать скругленные углы карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <source>Maximum initial 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/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation>строки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <source>Maximum expanded height for card view window:</source>
         <translation>Макс. высота окна для просмотра карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation>Жетоны на картах</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</source>
         <translation>Жетон %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
         <source>Hand layout</source>
         <translation>Раскладка руки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Отображать руку горизонтально (требует места)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>Выравнивание по левому краю</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Сетка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Инвертировать вертикальные координаты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Минимальное количество игроков для столбчатого расположения:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Максимальный размер шрифта для текста карт:</translation>
     </message>
@@ -302,12 +336,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -627,22 +656,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation>Посмотреть связанные карты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation>Добавить карту в колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation>Колода</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation>Сайд</translation>
     </message>
@@ -678,124 +707,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation>Показать...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation>Всем игрокам</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation>Посмотреть связанные карты</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation>Фишка:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</source>
         <translation>Все фишки:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="439"/>
         <source>&amp;Select All</source>
         <translation>Выбрать все</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="440"/>
         <source>S&amp;elect Row</source>
         <translation>Выбрать строку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation>Выбрать колонку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation>Разыграть</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation>Спрятать</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation>Разыграть лицом вниз</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Выключить разворот в фазе разворота</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation>Посмотреть лицевую сторону</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation>Клонировать</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation>Прикрепить к карте...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation>Открепить</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation>Нарисовать стрелку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation>Добавить заметку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation>Жетоны на карте</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation>&amp;Добавить жетон (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Убрать жетон (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>&amp;Установить жетоны (%1)...</translation>
     </message>
@@ -811,133 +840,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>своей руки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation>своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation>своей библиотеки</translation>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="189"/>
         <source>their library</source>
-        <comment>reveal zone</comment>
-        <translation>своей библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
-        <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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation>своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>своего кладбища</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>своего изгнания</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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="203"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation>своего сайда</translation>
     </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</comment>
+        <translation>своего сайда</translation>
+    </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>сайда %1</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
-        <source>their sideboard</source>
-        <comment>nominative</comment>
-        <translation>своего сайда</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
-        <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="212"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>кастомной зоны &apos;%2&apos; игрока &apos;%1&apos;</translation>
@@ -999,7 +1028,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1007,7 +1036,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Информация о карте</translation>
     </message>
@@ -1030,32 +1059,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation>Добавить в сайд</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation>Выбрать издание</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation>Посмотреть связанные карты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Добавить карту в сайд</translation>
     </message>
@@ -1063,32 +1092,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation>Обложка колоды</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation>Мана-стоимость</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation>Выбрать издание</translation>
     </message>
@@ -1161,17 +1190,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="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation>Фильтры</translation>
     </message>
     <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="140"/>
         <source>&amp;Clear all filters</source>
         <translation>Убрать все фильтры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation>Удалить выбранное</translation>
     </message>
@@ -1294,7 +1323,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation>Выбрать издание</translation>
     </message>
@@ -1302,166 +1331,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Обновить спойлеры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>Успешно</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation>Адреса URL загрузки были сброшены.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation>Загруженные изображения карт были сброшены.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>Добавить URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>Изменить URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation>Размер сетевого кеша:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation>TTL кеша перенаправлений:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation>Размер кеша изображений:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>Добавить новый URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>Удалить URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>Дней</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Обновление...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Выбрать путь</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>Приоритет загрузки URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>Спойлеры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>Скачивать спойлеры автоматически</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>Расположение спойлеров:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Последние изменения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Спойлеры скачиваются автоматически при запуске</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <source>Press the button to manually update without relaunching</source>
         <translation>Нажмите, чтобы обновить вручную без перезапуска</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Download card pictures on the fly</source>
         <translation>Синхронная загрузка изображений карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <source>How to add a custom URL</source>
         <translation>Как добавить пользовательский URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>Удалить загруженные изображения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>Обнулить загруженные URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation>Размер кеша для загруженных артов</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>Размер кеша в памяти для загруженных артов</translation>
     </message>
@@ -1469,32 +1498,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1502,27 +1531,27 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation>Количество</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation>Издание</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Номер</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation>Provider ID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Название</translation>
     </message>
@@ -1530,12 +1559,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation>Формат колоды (%1)</translation>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation>Все файлы (*.*)</translation>
     </message>
@@ -1632,94 +1661,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation>Обложка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation>Редактировать теги</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation>Переименовать колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation>Аннотировано</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation>Не аннотировано</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation>Переименовать файл</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation>Удалить файл</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <source>Set Banner Card</source>
         <translation>Установить обложку колоды</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation>Новое название:</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation>Не удалось переименовать</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation>Удалить файл</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation>Не удалось удалить</translation>
     </message>
@@ -1752,32 +1781,32 @@ 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/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1844,30 +1873,30 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation>Сайдборд заблокирован</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <source>The selected file could not be loaded.</source>
         <translation>Выбранный файл не может быть загружен</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation>Колода больше максимально возможного размера файла</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -2362,17 +2391,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation>Редактировать колоду из буфера обмена</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation>Неправильный деклист</translation>
     </message>
@@ -2873,17 +2902,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <source>Load deck from clipboard</source>
         <translation>Загрузить колоду из буфера</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Неверный деклист.</translation>
     </message>
@@ -2891,45 +2920,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation>Загрузить колоду из интернета</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation>Ошибка сети: %1</translation>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation>Получен пустой ответ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2954,73 +2983,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
         <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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation>Название карты (или поисковый запрос)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation>Количество:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation>Автоматически разыгрывать найденные карты</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <source>Put top cards on stack until...</source>
         <translation>Поместить вернюю карту в стек, пока...</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>Неправильный фильтр</translation>
     </message>
@@ -3182,12 +3178,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <source>Unknown Error loading card database</source>
         <translation>Неизвестная ошибка при загрузке базы карт.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3201,7 +3197,7 @@ Cockatrice не может корректно работать с испорче
 Вы хотите сменить расположение файла базы карт?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3215,7 +3211,7 @@ 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="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3228,7 +3224,7 @@ Would you like to change your database location setting?</source>
 Вы хотите изменить путь до локальной базы карт?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3236,7 +3232,7 @@ Would you like to change your database location setting?</source>
 Вы хотите сменить расположение файла базы карт?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3244,7 +3240,7 @@ Would you like to change your database location setting?</source>
 Вы хотите сменить расположение файла базы карт?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3257,59 +3253,59 @@ Would you like to change your database location setting?</source>
 Вы хотите изменить путь до локальной базы карт?</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</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="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Основные</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Интерфейс</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>Источник карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Горячие клавиши</translation>
     </message>
@@ -3626,67 +3622,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4134,143 +4130,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Путь</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Настройки пользователя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Язык:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>Пути расположения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <source>Decks directory:</source>
         <translation>Колоды:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
         <source>Filters directory:</source>
         <translation>Фильтровать директории:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
         <source>Replays directory:</source>
         <translation>Повторы:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
         <source>Pictures directory:</source>
         <translation>Изображения карт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
         <source>Card database:</source>
         <translation>База данных карт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <source>Token database:</source>
         <translation>База данных токенов:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
         <source>Update channel</source>
         <translation>Обновить канал</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation> дней</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation>Последнее проверка обновлений была %1 (%2 дней назад)</translation>
     </message>
@@ -4278,47 +4274,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation>Кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <source>&amp;View graveyard</source>
         <translation>Посмотреть кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <source>&amp;All players</source>
         <translation>Всем игрокам</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation>Рука</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation>Изгнание</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation>Показать случайно карту...</translation>
     </message>
@@ -4326,88 +4322,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation>Рука</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation>Посмотреть руку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation>Переместить руку...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation>Верх библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation>Низ библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation>Кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation>Изгнание</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation>Показать руку...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation>Показать случайную карту...</translation>
     </message>
@@ -4415,52 +4411,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation>Создать новую колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation>Посмотреть колоды</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation>Посмотреть базу карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation>Посмотреть EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation>Посмотреть повтор</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation>Подключение...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation>Подключиться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation>Играть</translation>
     </message>
@@ -4468,213 +4464,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</source>
         <translation>Библиотека</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
         <source>&amp;View library</source>
         <translation>Посмотреть библиотеку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</source>
         <translation>Посмотреть топдек</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
         <source>View bottom cards of library...</source>
         <translation>Посмотреть нижнюю карту библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
         <source>Reveal &amp;library to...</source>
         <translation>Показать библиотеку...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
         <source>Lend library to...</source>
         <translation>Предоставить доступ к библиотеке...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
         <source>Reveal &amp;top cards to...</source>
         <translation>Показать топдек...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
         <source>&amp;Top of library...</source>
         <translation>Топдек</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
         <source>&amp;Bottom of library...</source>
         <translation>Низ библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
         <source>&amp;Always reveal top card</source>
         <translation>&amp;Всегда показывать верхюю карту</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
         <source>&amp;Always look at top card</source>
         <translation>&amp;Всегда смотреть верхнюю карту</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
         <source>&amp;Open deck in deck editor</source>
         <translation>Открыть колоду в редакторе</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
         <source>&amp;Draw card</source>
         <translation>Взять карту</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
         <source>D&amp;raw cards...</source>
         <translation>Взять карты</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
         <source>&amp;Undo last draw</source>
         <translation>Отменить последнее взятие карты</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
         <source>Shuffle</source>
         <translation>Перемешать</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
         <source>&amp;Play top card</source>
         <translation>Сыграть топдек</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
         <source>Play top card &amp;face down</source>
         <translation>Сыграть топдек лицом вниз</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
         <source>Put top card on &amp;bottom</source>
         <translation>Положить топдек на низ библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation>Положить топдек в кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation>Положить топдек в изгнание</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation>Положить верхние карты в кладбище</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation>Положить верхние карты в кладбище</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation>Поместить вернюю карту в стек, пока...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation>Перемешать верхние карты</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation>&amp;Взять нижнюю карту</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation>Взять нижнюю карту библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation>Разыграть нижнюю карту библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation>Разыграть нижнюю карту библиотеки лицом вниз</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation>Положить нижнюю карту библиотеки в кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation>Положить нижнюю карту библиотеки в кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation>Положить нижние карты библиотеки в кладбище</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation>Положить нижние карты в изгнание...</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation>Переместить нижнюю карту на топдек</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation>Перемешать нижние карты...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation>Все игроки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation>Показать верхние карты библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Количество карт: (макс. %1)</translation>
     </message>
@@ -4776,8 +4752,18 @@ Will now login.</source>
 Идет соединение.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Количество игроков</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation>Введите количество игроков.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Игрок %1</translation>
     </message>
@@ -4880,8 +4866,8 @@ Will now login.</source>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -5286,144 +5272,144 @@ Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>База карт</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>Открыть настройки</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>Найдены новые издания</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <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="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>Просмотреть издания</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>Добро пожаловать</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <source>A card database update is already running.</source>
         <translation>Обновление базы карт уже идет.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <source>Unable to run the card database updater: </source>
         <translation>Не удалось запустить обновление базы карт:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5434,55 +5420,55 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 Чтобы обновить клиент, перейдите в Справка-&gt; Проверка обновлений.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Загрузить издания/карты</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation>Выбранный файл не найден.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <source>You can only import XML databases at this time.</source>
         <translation>На данный момент вы только можете предостовлять базы данных в формате XML.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Не удалось импортировать издания/карты.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
         <translation>Невозможно сбросить пароль. Пожалуйста, свяжитесь с оператором сервера.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation>Запрос активации получен. Вам отправлен код активации. Пожалуйста, проверьте свой e-mail.</translation>
     </message>
@@ -5533,7 +5519,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5687,610 +5673,590 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>из игры</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation>из их кладбищ</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation> из изгнания</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation>из их рук</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source>the top card of their library</source>
         <translation>верхнюю карту своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <source> from the top of their library</source>
         <translation>с верха своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source>the bottom card of their library</source>
         <translation>нижнюю карту своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation>с низа своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s library</source>
         <translation>из библиотеки %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>из своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation> из сайдборда</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation> из стека</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 сдался.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 восстановил связь с игрой.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 потерял связь с игрой.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 создает фишку: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 загрузил колоду (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1 уничтожает  %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>карту</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="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>%1 изгоняет %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 разыгрывает %2%3.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <source>The game has been closed.</source>
         <translation>Игра закрыта.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>Игра началась.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <source>%1 has joined the game.</source>
         <translation>%1 присоединился к игре.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 вошел как зритель.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <source>You have been kicked out of the game.</source>
         <translation>Вы были отключены от игры</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <source>%1 has left the game (%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="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 готов начать игру.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 открывает %2 для %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 открывает %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 случайным образом открывает %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 открывает %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>Орел</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>Решка</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <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>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <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>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%2 теперь разворачивается как обычно (%1).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 заблокировал(а) свой сайдборд.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 разблокировал(а) свой сайдборд.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 поворачивает свои перманенты.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 разворачивает свои перманенты.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 поворачивает %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 разворачивает %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 размешал %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 открепляет %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 отменяет последние взятия.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 отменяет последние взятия (%2).</translation>
     </message>
@@ -6298,110 +6264,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Добавить сообщение</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Сообщение:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>Настройки чата</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>Пользовательские предупреждения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>Включить упоминания в чате</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>Включить автозавершение упоминаний</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation>Макросы сообщений игрового чата</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation>Как использовать внутриигровые макросы для сообщений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Не уведомлять о сообщениях в чате от незарегистрированных пользователей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Не уведомлять о личных сообщениях от незарегистрированных пользователей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>Инвертировать цвет текста</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Включить оповещения о личных сообщениях</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Включить оповещения об упоминаниях</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable room message history on join</source>
         <translation>Отображать историю сообщений при присоединении к комнате.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>(Шестнадцатеричный цвет)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Разделять слова пробелом, только для букв и цифр</translation>
     </message>
@@ -6414,37 +6380,32 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6586,57 +6547,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Шаг разворота</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Шаг поддержки</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Шаг взятия карты</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>Первая главная фаза</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Шаг начала боя</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Шаг назначения атакующих</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Шаг назначения блокирующих</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Шаг нанесения повреждений</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Шаг завершения боя</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>Вторая главная фаза</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Заключительный шаг</translation>
     </message>
@@ -6653,138 +6614,134 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation>Взять карты</translation>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation>Взять карты с низа библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation>Установить жетоны</translation>
     </message>
@@ -6792,65 +6749,48 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation>&amp;Жетоны</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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6899,25 +6839,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7056,33 +6988,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7231,37 +7136,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7304,14 +7209,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>Игры</translation>
     </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>
@@ -7376,53 +7273,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7489,27 +7386,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>Включить &amp;звуки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>Звуковая тема:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation>Протестировать системный звук</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>Настройки звука</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>Громкости</translation>
     </message>
@@ -7725,123 +7622,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7849,52 +7682,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>Информация о карте</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>Колода</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>Фильтры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>Видимый</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>Плавающий</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>Сбросить слой</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Колода: %1</translation>
     </message>
@@ -7902,55 +7743,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -8015,7 +7862,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>Новая папка</translation>
     </message>
@@ -8097,18 +7944,18 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Название новой папки:</translation>
     </message>
@@ -8126,12 +7973,12 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8180,191 +8027,197 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>Запись игры</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>Список игроков</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>Информация о карте</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</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="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>Полоса прокрутки записи</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>&amp;Фазы</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>&amp;Игра</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</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="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</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="300"/>
         <source>Reverse turn order</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="303"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;Удалить все указатели</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <source>Rotate View Cl&amp;ockwise</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="309"/>
         <source>Rotate View Co&amp;unterclockwise</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="312"/>
         <source>Game &amp;information</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="315"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Сдаться...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>Покинуть и&amp;гру</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>З&amp;акрыть повтор</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation>Ска&amp;зать:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>Видимый</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>Плавающий</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>Сбросить слой</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Сдаться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Покинуть игру</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the 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="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>Вы были отключены от игры</translation>
     </message>
@@ -9463,152 +9316,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>Основные настройки интерфейса</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <source>Annotate card text on tokens</source>
         <translation>Изменить текст карты на токенах</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation>Включить оповещения в панели задач.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Настройки анимации</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Анимировать поворот/разворот карты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation>Редактор колод/Настройки хранилища</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <source>Open deck in new tab by default</source>
         <translation>Открывать колоду в новой вкладке</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <source>Use visual deck storage in game lobby</source>
         <translation>Использовать графическое представление карт в лобби игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <source>Use selection animation for Visual Deck Storage</source>
         <translation>Использовать анимацию при выборе карты в графическом хранилище</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation>всегда конвертировать в .cod</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Время отката назад при нажатии шортката</translation>
     </message>
@@ -9672,24 +9515,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9716,108 +9558,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9825,32 +9584,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9886,7 +9635,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9894,19 +9643,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9914,37 +9663,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9958,22 +9697,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9981,64 +9750,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10046,17 +9807,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10072,52 +9833,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10218,133 +9974,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <source>Move selected set to the top</source>
         <translation>Переместить выбранное издание наверх</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation>Переместить выбранное издание вверх</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation>Переместить выбранное издание вниз</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <source>Move selected set to the bottom</source>
         <translation>Переместить выбранное издание в конец.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>Включить все издания</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>Отключить все издания</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation>Включить выбранные издания</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation>Отключить выбранные издания</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>Редактор колод</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</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="135"/>
         <source>How to use custom card art</source>
         <translation>Как использовать кастомный арт для карты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10352,72 +10108,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</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="229"/>
         <source>Group by Type</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="230"/>
         <source>Group by Mana Value</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="231"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</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="239"/>
         <source>Sort by Name</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="240"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>Перемешать после просмотра</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>просмотр вразнобой</translation>
     </message>
@@ -10452,7 +10208,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>Редактор колоды</translation>
     </message>
@@ -10533,7 +10289,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -10685,7 +10441,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
@@ -11106,8 +10862,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -11127,102 +10882,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <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="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Изгнание</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Кладбище</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Рука</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</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="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
@@ -11258,246 +11009,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation>Взять карту с низа библиотеки</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Взять несколько карт с низа библиотеки...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Сдаться</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>Муллиган</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>Взять карту</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>Взять несколько карт</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>Всегда показывать верхнюю карту</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>Всегда смотреть верхнюю карту</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>Убрать фокус с окна ввода</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>Установить фокус на чат</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>Очистить чат</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
-        <translation>Обновить</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation>Логи</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_sr.ts b/cockatrice/translations/cockatrice_sr.ts
index c04d16f16..1116a20ae 100644
--- a/cockatrice/translations/cockatrice_sr.ts
+++ b/cockatrice/translations/cockatrice_sr.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,60 +36,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <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="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <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="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Podešavanja teme</translation>
     </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>Current theme:</source>
         <translation>Sadašnja tema:</translation>
     </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>Open themes folder</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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>Raspored ruke</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"/>
     </message>
@@ -300,12 +322,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +642,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -676,124 +693,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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</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="439"/>
         <source>&amp;Select All</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="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -809,133 +826,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -997,7 +1014,7 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1028,32 +1045,32 @@ 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/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,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="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</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="1284"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1467,32 +1484,32 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Broj</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Karta</translation>
     </message>
@@ -1528,12 +1545,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="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1750,32 +1767,32 @@ 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/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ 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/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2867,17 +2884,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <source>Load deck from clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2885,43 +2902,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2940,73 +2957,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3167,12 +3151,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3183,7 +3167,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3194,7 +3178,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3203,14 +3187,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3219,7 +3203,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3228,59 +3212,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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Podešavanja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Opšto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Izgled</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Korisnički interfejs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Ćaskanje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Zvuk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Prečice</translation>
     </message>
@@ -3593,67 +3577,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4101,143 +4085,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Izaberi put</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Lična podešavanja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>Jezik:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>Putevi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <source>Decks directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <source>Replays directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
         <source>Pictures directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
         <source>Card database:</source>
         <translation>Baza podataka karata:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <source>Token database:</source>
         <translation>Baza podataka tokena:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4245,47 +4229,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4293,88 +4277,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4382,52 +4366,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4435,213 +4419,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4732,8 +4696,18 @@ Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation type="unfinished"/>
     </message>
@@ -4836,8 +4810,8 @@ Will now login.</source>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
@@ -5238,144 +5212,144 @@ Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <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="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5383,54 +5357,54 @@ 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="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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
@@ -5481,7 +5455,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5635,233 +5609,223 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</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="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s 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="83"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</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="153"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <source>%1 gives %2 control over %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <source>%1 puts %2 into play%3.</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="317"/>
-        <source>%1 exiles %2%3 face down.</source>
+        <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -5870,375 +5834,365 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <source>The game has been closed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <source>%1 is now watching the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <source>%1 has left the game (%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="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <source>%1 reveals %2%3 to %4.</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="557"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <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="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <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="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -6246,110 +6200,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</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="1510"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
@@ -6362,37 +6316,32 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6534,57 +6483,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation type="unfinished"/>
     </message>
@@ -6601,138 +6550,134 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6740,65 +6685,48 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6847,25 +6775,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7004,33 +6924,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7179,37 +7072,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7252,14 +7145,6 @@ Are you sure you would like to disable this feature?</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>
@@ -7324,53 +7209,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7437,27 +7322,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -7673,123 +7558,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7797,52 +7618,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7850,55 +7679,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7963,7 +7798,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
@@ -8044,18 +7879,18 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
@@ -8073,12 +7908,12 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8127,191 +7962,197 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</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="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</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="289"/>
         <source>&amp;Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</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="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</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="300"/>
         <source>Reverse turn order</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="303"/>
         <source>&amp;Remove all local arrows</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="306"/>
         <source>Rotate View Cl&amp;ockwise</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="309"/>
         <source>Rotate View Co&amp;unterclockwise</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="312"/>
         <source>Game &amp;information</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="315"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the 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="641"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
@@ -9405,152 +9246,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9614,24 +9445,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9658,108 +9488,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9767,32 +9514,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9828,7 +9565,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9836,19 +9573,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9856,37 +9593,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9900,22 +9627,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9923,64 +9680,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -9988,17 +9737,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10014,52 +9763,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10160,133 +9904,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <source>Move selected set to the top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <source>Move selected set to the bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</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="135"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10294,72 +10038,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</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="229"/>
         <source>Group by Type</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="230"/>
         <source>Group by Mana Value</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="231"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</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="239"/>
         <source>Sort by Name</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="240"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -10394,7 +10138,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -10475,7 +10219,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -10627,7 +10371,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
@@ -11048,8 +10792,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -11069,102 +10812,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <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="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Izgnanstvo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Groblje</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Ruka</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</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="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
@@ -11200,246 +10939,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_sv.ts b/cockatrice/translations/cockatrice_sv.ts
index 376b9fe5f..227983d31 100644
--- a/cockatrice/translations/cockatrice_sv.ts
+++ b/cockatrice/translations/cockatrice_sv.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,60 +36,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>Temainställningar</translation>
     </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>Current theme:</source>
         <translation>Aktuellt tema:</translation>
     </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>Open themes folder</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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>Kortrendering</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <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="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <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="744"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>Handlayout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <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="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>Aktivera vänsterjustering</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>Bordets rutnätlayout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>Invertera vertikal koordinat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <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="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximal teckenstorlek för information som visas på kort:</translation>
     </message>
@@ -300,12 +322,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +642,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -676,124 +693,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</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="439"/>
         <source>&amp;Select All</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="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -809,133 +826,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -997,7 +1014,7 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1028,32 +1045,32 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,17 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>Uppdatera Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>Lägg till webbadress</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>Uppdaterar ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>Välj sökväg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>Ladda ner Spoilers automatiskt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Plats:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>Senaste ändring</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <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="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <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="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <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="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <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="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>Ta bort nedladdade bilder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>Återställ nedladdnings-webbadresser</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1467,32 +1484,32 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>Kort</translation>
     </message>
@@ -1528,12 +1545,12 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1750,32 +1767,32 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2868,17 +2885,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <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="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>Ogiltig leklista.</translation>
     </message>
@@ -2886,43 +2903,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2941,73 +2958,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3168,12 +3152,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3190,7 +3174,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="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3207,7 +3191,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="1903"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3216,7 +3200,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3225,7 +3209,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="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3234,7 +3218,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="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3243,59 +3227,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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>Utseende</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>Gränssnitt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>Chatt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>Ljud</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>Genvägar</translation>
     </message>
@@ -3609,67 +3593,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4117,143 +4101,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>Välj sökväg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>Personliga inställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <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/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <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/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <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/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <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/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4261,47 +4245,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4309,88 +4293,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4398,52 +4382,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4451,213 +4435,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4755,8 +4719,18 @@ Will now login.</source>
 Inloggning påbörjad.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>Antal spelare</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <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="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>Spelare %1</translation>
     </message>
@@ -4859,8 +4833,8 @@ Inloggning påbörjad.</translation>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
@@ -5264,144 +5238,144 @@ Lokal version är %1, avlägsen version är %2.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <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="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5412,54 +5386,54 @@ Det  behöver inte innebära problem men det kan vara ett tecken på att det fin
 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="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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>Ladda utgåvor/kort</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <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="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <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="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>Det gick inte att importera utgåvor/kort.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <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="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <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>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
@@ -5510,7 +5484,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5664,233 +5638,223 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation> från exil</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</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="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <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="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation> från sidbrädan</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation> från stapeln</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</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="153"/>
         <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="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>ett kort</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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="317"/>
-        <source>%1 exiles %2%3 face down.</source>
+        <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -5899,375 +5863,365 @@ Cockatrice will now reload the card database.</source>
         <translation>%1 sätter %2%3 i exil.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 spelar %2%3.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <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="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <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="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <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="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>Spelet har börjat.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <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="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <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="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <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="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <source>%1 reveals %2%3 to %4.</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="557"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>%1&apos;s tur</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -6275,110 +6229,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>Lägg till meddelande</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>Meddelande:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <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="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
@@ -6391,37 +6345,32 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6563,57 +6512,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Uptappningssteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Underhållssteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Dragsteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>Första huvudfasen</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Början av stridssteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Attacksteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Blockeringssteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Skadesteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Slutet av stridssteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>Andra huvudfasen</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Slutsteget</translation>
     </message>
@@ -6630,138 +6579,134 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6769,65 +6714,48 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6876,25 +6804,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7033,33 +6953,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7208,37 +7101,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7281,14 +7174,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>Spel</translation>
     </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>
@@ -7353,53 +7238,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <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="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7466,27 +7351,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -7702,123 +7587,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7826,52 +7647,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>Lek: %1</translation>
     </message>
@@ -7879,55 +7708,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7992,7 +7827,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>Ny mapp</translation>
     </message>
@@ -8073,18 +7908,18 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>Namn på den nya mappen:</translation>
     </message>
@@ -8102,12 +7937,12 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8156,191 +7991,197 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</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="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</source>
         <translation>&amp;Faser</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="289"/>
         <source>&amp;Game</source>
         <translation>&amp;Spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</source>
         <translation>Nästa &amp;fas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</source>
         <translation>Nästa &amp;tur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>Reverse turn order</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="303"/>
         <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="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <source>Rotate View Cl&amp;ockwise</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="309"/>
         <source>Rotate View Co&amp;unterclockwise</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="312"/>
         <source>Game &amp;information</source>
         <translation>Spel&amp;information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;Ge upp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Lämna spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <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="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation>S&amp;äg:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>Ge upp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>Lämna spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the 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="641"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
@@ -9434,152 +9275,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>Allmänna gränssnittsinställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>Animationsinställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Tappnings/Upptappningsanimation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9643,24 +9474,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9687,108 +9517,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9796,32 +9543,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9857,7 +9594,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9865,19 +9602,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9885,37 +9622,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9929,22 +9656,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9952,64 +9709,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10017,17 +9766,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10043,52 +9792,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10189,133 +9933,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <source>Move selected set to the top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <source>Move selected set to the bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <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="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="71"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</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="135"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10323,72 +10067,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</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="229"/>
         <source>Group by Type</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="230"/>
         <source>Group by Mana Value</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="231"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</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="239"/>
         <source>Sort by Name</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="240"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <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="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -10423,7 +10167,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -10504,7 +10248,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -10656,7 +10400,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
@@ -11077,8 +10821,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -11098,102 +10841,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <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="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>Exil</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>Kyrkogård</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</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="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</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="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
@@ -11229,246 +10968,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>Lämna spelet</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>Medge</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>Kasta tärning</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>Dra ett kort</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation>Visuell Leklagring</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation>Leklagring</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation>Administratör</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation>Loggar</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_yue.ts b/cockatrice/translations/cockatrice_yue.ts
index e3c73b94a..6b0d0b9a8 100644
--- a/cockatrice/translations/cockatrice_yue.ts
+++ b/cockatrice/translations/cockatrice_yue.ts
@@ -23,73 +23,73 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
-        <translation>&amp;刷新</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
-        <translation>解析組名及編號(如果有) </translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
-        <translation>你確定嗎？</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
-        <translation>出錯</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>主題設定</translation>
     </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>Current theme:</source>
         <translation>現在主題</translation>
     </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>Open themes folder</source>
         <translation>打開主題文件夾</translation>
     </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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation>選單設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>在右擊選單中顯示鍵盤快速鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>卡面算繪</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <source>Display card names on cards having a picture</source>
         <translation>最有圖片的牌上顯示牌名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>將打橫佈局卡片自動向上旋轉</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <source>Scale cards on mouse over</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="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <source>Maximum initial 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/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation>橫列</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
-        <translation>牌指示物</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</source>
-        <translation>指示物  %1</translation>
+        <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="760"/>
         <source>Hand layout</source>
         <translation>手牌佈局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>打棟顯示手牌(浪費空間)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>啟用向左對齊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>表格布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>反轉垂直坐標</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>界面佈局之內能夠容納的最少玩家數量：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>卡牌上顯示的最大字體大小</translation>
     </message>
@@ -300,14 +322,9 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <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="93"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
-        <translation>在套牌編輯&amp;打開牌庫檔案</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -315,7 +332,7 @@ Please check that the directory is writable and try again.</source>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
         <source>Theme</source>
-        <translation>卡牌主题</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
@@ -531,7 +548,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     <message>
         <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
         <source>Name (Exact)</source>
-        <translation>名稱(確切）</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
@@ -591,12 +608,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     <message>
         <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
-        <translation>主要類型</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
-        <translation>副類型</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -619,30 +636,30 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     <message>
         <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
         <source>View transformation</source>
-        <translation>查看轉化</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation>查看關聯卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
-        <translation>添加卡牌到牌庫</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
-        <translation>主牌庫</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
-        <translation>副牌庫</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -655,12 +672,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     <message>
         <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Set:</source>
-        <translation>牌組:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
         <source>Collector Number:</source>
-        <translation>收藏號碼:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
@@ -676,124 +693,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
-        <translation>&amp;展示给...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation>&amp;所有玩家</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation>查看關聯卡牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation>令牌:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation>所有令牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation>&amp;全選</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation>&amp;選擇橫行</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation>&amp;選擇直行</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation>&amp;使出</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation>&amp;隱藏</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation>&amp;面朝下使出</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
-        <source>&amp;Tap / Untap</source>
-        <extracomment>Turn sideways or back again</extracomment>
-        <translation>&amp;横置/重置</translation>
-    </message>
-    <message>
-        <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="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <source>&amp;All players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
+        <source>View related cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
+        <source>Token: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
+        <source>All tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/card_menu.cpp" line="439"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/card_menu.cpp" line="440"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <source>&amp;Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <source>&amp;Hide</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <source>Play &amp;Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <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="449"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -809,136 +826,136 @@ 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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation>它們的手牌</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation>%1的手牌</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <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="181"/>
+        <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="183"/>
-        <source>their library</source>
-        <comment>look at zone</comment>
-        <translation>它們的牌庫</translation>
+        <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="184"/>
-        <source>%1&apos;s library</source>
-        <comment>look at zone</comment>
-        <translation>%1的牌庫</translation>
+        <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="186"/>
-        <source>of their library</source>
-        <comment>top cards of zone,</comment>
-        <translation>它們的牌庫中</translation>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
         <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>%1的牌庫中</translation>
+        <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="189"/>
         <source>their library</source>
-        <comment>reveal zone</comment>
-        <translation>它們的牌庫</translation>
+        <comment>shuffle</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
-        <comment>reveal zone</comment>
-        <translation>%1的牌庫</translation>
+        <comment>shuffle</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</source>
-        <comment>shuffle</comment>
-        <translation>它們的牌庫</translation>
+        <comment>nominative</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>%1&apos;s library</source>
-        <comment>shuffle</comment>
-        <translation>%1的牌庫</translation>
+        <comment>nominative</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
-        <source>their library</source>
-        <comment>nominative</comment>
-        <translation>它們的牌庫</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
-        <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="197"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation>它們的墳場</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation>%1的的墳場</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation>它們的放逐區</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation>%1的放逐區</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
+        <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="201"/>
+        <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="203"/>
         <source>their sideboard</source>
-        <comment>look at zone</comment>
-        <translation>它們的備牌</translation>
+        <comment>nominative</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>%1的備牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
-        <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation>它們的備牌</translation>
+        <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>%1的備牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
-        <translation>它們的自定區域 &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
-        <translation>%1的自定區域&apos;%2&apos;</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -997,7 +1014,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1028,32 +1045,32 @@ 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/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,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="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>更新預覽卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation>下載URL已重置。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation>下載的卡牌圖片已被重置。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>添加URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>更改URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation>圖片網路緩存大小：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation>網路緩處再定向生存時間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation>圖片緩存大小：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>添置新 URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>移除 URL.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>更新中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>選擇路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>URL下載優先次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>自動下載預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>預覽位置:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>最後變更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <source>Spoilers download automatically on launch</source>
         <translation>開啟時自動下載預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <source>Press the button to manually update without relaunching</source>
         <translation>免重新啟動人手按制更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Download card pictures on the fly</source>
         <translation>即時下載卡牌圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <source>How to add a custom URL</source>
         <translation>如何添加自定URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>刪除已下載的圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>重置下載URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation>下載圖片專用硬盤緩儲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>現不在螢光幕上記憶中圖片緩儲</translation>
     </message>
@@ -1467,32 +1484,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation>數目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation>牌組</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>號碼</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation>提供者 id</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>卡牌</translation>
     </message>
@@ -1528,12 +1545,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1750,32 +1767,32 @@ 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/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation>解鎖鎖上</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <source>The selected file could not be loaded.</source>
         <translation>選擇的檔案不能再入</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2867,17 +2884,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <source>Load deck from clipboard</source>
         <translation>從剪貼板載入牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>牌表不能載入</translation>
     </message>
@@ -2885,43 +2902,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2940,73 +2957,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation>卡牌名稱(或搜尋表達式)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation>因為cockatrice原生沒有ssl支援, 所以你不能自動下載更新. 請瀏覽到我們的下載網頁,進行人手更新.</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation>開關副牌上鎖</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <source>Put top cards on stack until...</source>
         <translation>把頂牌放在重疊區, 直到...</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>篩選無效</translation>
     </message>
@@ -3169,12 +3153,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <source>Unknown Error loading card database</source>
         <translation>讀取卡牌資料庫時出現不知名錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3191,7 +3175,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3208,7 +3192,7 @@ 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="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3221,7 +3205,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3229,7 +3213,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3238,7 +3222,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3254,59 +3238,59 @@ https://github.com/Cockatrice/Cockatrice/issues
 你想不想更改你的資料庫位置設定?</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</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="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>外觀</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>用戶界面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>卡牌來源</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>聲音</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>快捷键</translation>
     </message>
@@ -3620,67 +3604,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4128,143 +4112,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>選擇路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>個人設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>語言:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <source>Decks directory:</source>
         <translation>牌庫路徑:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <source>Replays directory:</source>
         <translation>遊戲錄像目錄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
         <source>Pictures directory:</source>
         <translation>圖片目錄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
         <source>Card database:</source>
         <translation>卡牌資料庫：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <source>Token database:</source>
         <translation>令牌資料庫:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
         <source>Update channel</source>
         <translation>更新渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4272,47 +4256,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4320,88 +4304,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4409,52 +4393,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4462,213 +4446,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4762,8 +4726,18 @@ Will now login.</source>
 現在登入.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>玩家人數</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation>請輸入玩家人數</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>玩家 %1</translation>
     </message>
@@ -4866,8 +4840,8 @@ Will now login.</source>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
@@ -5273,36 +5247,36 @@ Local version is %1, remote version is %2.</source>
         <translation>顯示/隱藏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice 已被安裝</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>卡牌資料庫</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5311,29 +5285,29 @@ If unsure or first time user, choose &quot;Yes&quot;</source>
 如果不確定, 或者是第一次使用，請選擇“是/Yes”</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>打開設置</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>發現新卡组</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5342,17 +5316,17 @@ Do you want to enable it/them?</source>
 要啟用它們嗎？</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>查看卡组</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>歡迎</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5361,64 +5335,64 @@ Read more about changing the set order or disabling specific sets and consequent
 請閱讀,了解更多在“卡组设置”對話框裡.更改卡组顺序或者禁用某些卡组的功能.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <source>A card database update is already running.</source>
         <translation>資料庫更新現已進行.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <source>Unable to run the card database updater: </source>
         <translation>不能運行卡牌資料附更新程式:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5430,54 +5404,54 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 請到&quot;援助-&gt;檢查更新&quot;去更新你的客戶端.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>载入卡组/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation>找不到選擇的文件。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <source>You can only import XML databases at this time.</source>
         <translation>你暫時只能導入xml資料庫.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>卡組/卡牌導入失敗.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation>重設密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
         <translation>你的密碼已經成功重置, 你可以用新密碼重新登入。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
         <translation>重置用戶密碼失敗, 請聯絡伺服器管責人重置密碼.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation>已經收到啟動要求,   請從你的電郵獲取啟動驗證碼.</translation>
     </message>
@@ -5528,7 +5502,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5682,610 +5656,590 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>從戰場上</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation>從它們的墳場</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation>從放逐區</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation>從它們的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source>the top card of their library</source>
         <translation>它們的頂牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <source> from the top of their library</source>
         <translation>從它們1牌庫頂</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source>the bottom card of their library</source>
         <translation>它們牌庫的底牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation>從它們的牌庫底</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s library</source>
         <translation>從%1的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>從它們的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation>從備牌中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation>從疊區中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</source>
         <translation> %1 在此遊戲宣佈降服.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <source>%1 has unconceded the game.</source>
         <translation> %1 收回在此遊戲降服.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1已恢復連接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 已失去連接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 派出令牌: %2%3</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 已载入牌庫(%2)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1销毁了%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>一張牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="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>%1 放逐%2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1使出 %2%3。</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation>底部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation>頂部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1把%2翻為面朝下。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1把%2翻為面朝上。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <source>The game has been closed.</source>
         <translation>遊戲已經關閉。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>遊戲已開始。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <source>%1 has joined the game.</source>
         <translation>%1 已經加入遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 正在旁觀遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 已經離開遊戲(%2)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1已準備好開始遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <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="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1把%2展示給%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 展示 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1隨機展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>逆轉</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>正常</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>正面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>翻面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>輪到 %1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 將 %2 設置為照常重置。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 移除%2的力量/防禦.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1已經鎖定它們的的副牌庫。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1已經把它們的的副牌庫解鎖。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>%1横置它們的永久卡牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1重置它們的永久卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 横置 %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 重置 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>% 1 對 %2  洗牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 取消了%2的結附。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 放回它們最後一張抽到的卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation> %1 放回它們最後一張抽到的卡牌(%2).</translation>
     </message>
@@ -6293,110 +6247,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>詞1 詞2 詞3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>添加新信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation>移除信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>添加信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>聊天設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>自定通知觸發詞語</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>允許聊天中提到某人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>允許自動完成提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation>遊戲內短信速鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation>如何使用遊戲內短信速鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>不要顯示未註冊用户的聊天消息。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>不要顯示未註冊用户的私人消息.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>反轉文本顏色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>容許桌面提醒提及私人消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Enable desktop notification for mentions</source>
         <translation>容許桌面提醒提及聊天提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable room message history on join</source>
         <translation>加入聊天室時開啓消息歷史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>（顏色為16進制）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>將單詞以空格區分，僅支持字母.</translation>
     </message>
@@ -6409,37 +6363,32 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6581,57 +6530,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>重置步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>維持步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>抓牌步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>第一主階段</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>戰鬥開始步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>宣告阻擋步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>宣告阻擋步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>戰鬥損害步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>戰鬥結束步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>第二主階段</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>回合完結部</translation>
     </message>
@@ -6648,138 +6597,134 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6787,65 +6732,48 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation>喜好</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation>版本上別針</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation>版本脫別針</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation>顯示關聯卡牌</translation>
     </message>
@@ -6894,25 +6822,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation>發行日期</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation>由後到先</translation>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7051,33 +6971,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7226,37 +7119,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7299,14 +7192,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>遊戲(眾)</translation>
     </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>
@@ -7371,53 +7256,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation>恢復所有常用快鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation>清除所有常用快鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>確認清除所有快鍵嗎?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>部分：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>行動:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>快鍵:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation>如何設置自定快鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation>清除所有快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation>按快鍵名稱搜尋</translation>
     </message>
@@ -7486,27 +7371,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>啓用&amp;聲效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>現前聲效主題：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation>測試系統聲效引擎</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>聲效設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>主音量</translation>
     </message>
@@ -7722,123 +7607,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7846,52 +7667,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>卡牌資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>篩選項目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;視圖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation>印刷版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>可見</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>浮動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>重置布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>牌庫:%1</translation>
     </message>
@@ -7899,55 +7728,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -8012,7 +7847,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>新文件夾</translation>
     </message>
@@ -8093,18 +7928,18 @@ Please enter a name:</source>
         <translation>你確定要刪除被選檔案(眾)嗎 ？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation>刪除伺服器上的牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>新建文件夾名稱:</translation>
     </message>
@@ -8122,12 +7957,12 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8176,191 +8011,197 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>遊戲錄像重溫</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>玩家列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>卡牌資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</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="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>錄像時間線</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</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="289"/>
         <source>&amp;Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</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="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</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="300"/>
         <source>Reverse turn order</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="303"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;移除所有自設箭頭</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <source>Rotate View Cl&amp;ockwise</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="309"/>
         <source>Rotate View Co&amp;unterclockwise</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="312"/>
         <source>Game &amp;information</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="315"/>
         <source>Un&amp;concede</source>
         <translation>撤銷&amp;投降</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>&amp;離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;關閉遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation>&amp;視圖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>可見</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>浮動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>重置布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>撤銷投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation>有玩家加入遊戲 #%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the game</source>
         <translation>%1 已經加入遊戲。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出遊戲。</translation>
     </message>
@@ -9460,152 +9301,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>一般通用接口設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <source>Annotate card text on tokens</source>
         <translation>在令牌上標註牌中文字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>通告設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation>開啓任務欄通告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>動畫設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;橫置/重置 動畫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <source>Open deck in new tab by default</source>
         <translation>把用新頁開啟牌庫作為常用設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation>重播設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>用速鍵啟動向後跳的緩衝時間:</translation>
     </message>
@@ -9669,24 +9500,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9713,108 +9543,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9822,32 +9569,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9883,7 +9620,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9891,19 +9628,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9911,37 +9648,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9955,22 +9682,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9978,64 +9735,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10043,17 +9792,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10069,52 +9818,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10215,133 +9959,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <source>Move selected set to the top</source>
         <translation>將選擇的牌組送到最頂</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation>將選擇的牌組往上一格</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation>將選擇的牌組往下一格</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <source>Move selected set to the bottom</source>
         <translation>將選擇的牌組送到最底</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <source>Search by set name, code, or type</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="71"/>
         <source>Default order</source>
         <translation>常用次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation>恢復常用藝術先後次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>啟用所有牌組</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>禁用所有卡组</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation>啟用選擇的牌組(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation>停用選擇的牌組(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>牌庫編輯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>卡牌藝術</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="135"/>
         <source>How to use custom card art</source>
         <translation>如何使用自定卡牌圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>筆記</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>管理牌組</translation>
     </message>
@@ -10349,72 +10093,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</source>
         <translation>未分組</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Group by Type</source>
         <translation>按類型分組</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <source>Group by Mana Value</source>
         <translation>按法力數值分組</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Color</source>
         <translation>按顏色排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</source>
         <translation>未排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Sort by Name</source>
         <translation>按名稱排次序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Type</source>
         <translation>按類型排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation>按法力費用排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation>按顏色(眾) 排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation>按力量/防禦力排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation>按排組排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>關閉界面時洗牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>棟疊觀看</translation>
     </message>
@@ -10449,7 +10193,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>牌庫編輯</translation>
     </message>
@@ -10530,7 +10274,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation>遊戲錄像</translation>
     </message>
@@ -10682,7 +10426,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>重置佈局</translation>
     </message>
@@ -11103,9 +10847,8 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <source>Toggle Untap</source>
+        <translation>鎖定重置狀態</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11124,102 +10867,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <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>结附牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>解除牌结附</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>複製卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>派出令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>派出所有相關令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>再做另外令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>記下註解</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation>選擇所有在區域的牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation>選擇所有橫行牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation>選擇所有直行牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>牌庫底</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>放逐</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>墳場</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>手牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>牌庫頂</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>戰場，面朝下</translation>
     </message>
@@ -11255,246 +10994,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>疊區</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation>多張送墳場</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation>多張放逐</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation>找到以下牌前全送疊區</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation>從牌庫底抽一張牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>從牌庫底抽超過一張牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>畫箭咀</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation>清除自設箭咀</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>擲骰</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>洗牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>再調度</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>抽一張牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>抽超過一張牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>撤銷抽牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>永遠顯示頂牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>永遠看到頂牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>視角順時針轉</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>視角逆時針轉</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>取消聚焦文本框</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>聚焦聊天</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>掃清聊天</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>刷新</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation>跳前</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation>跳後</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation>向前大跳</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation>向後大跳</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation>播放/暫停</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation>切換快進</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_zh-Hans.ts b/cockatrice/translations/cockatrice_zh-Hans.ts
index 3e219b572..f26c5939b 100644
--- a/cockatrice/translations/cockatrice_zh-Hans.ts
+++ b/cockatrice/translations/cockatrice_zh-Hans.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,60 +36,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
-        <translation>秒</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>主题设定</translation>
     </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>Current theme:</source>
         <translation>现在主题</translation>
     </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>Open themes folder</source>
         <translation>打开主题文件夹</translation>
     </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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation>选单设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>在右击选单中显示键盘快速键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>卡面算绘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <source>Display card names on cards having a picture</source>
         <translation>最有图片的牌上显示牌名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>将打横佈局卡片自动向上旋转</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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="743"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <source>Scale cards on mouse over</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="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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="747"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <source>Maximum initial 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/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation>横列</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>手牌佈局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>打栋显示手牌(浪费空间)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>啟用向左对齐</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>表格布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>反转垂直坐标</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>界面佈局之内能够容纳的最少玩家数量：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>卡牌上显示的最大字体大小</translation>
     </message>
@@ -300,12 +322,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -315,12 +332,12 @@ Please check that the directory is writable and try again.</source>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
         <source>Theme</source>
-        <translation>卡牌主题</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
         <source>Art crop of random card</source>
-        <translation>随机卡牌：艺术取料</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
@@ -625,22 +642,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation>查看关联卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -676,124 +693,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</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="439"/>
         <source>&amp;Select All</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="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -809,133 +826,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -997,7 +1014,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1028,32 +1045,32 @@ 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/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,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="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>更新预览卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation>下载URL已重置。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation>下载的卡牌图片已被重置。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>添加URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>更改URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation>图片网路缓存大小：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation>网路缓处再定向生存时间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation>图片缓存大小：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>添置新 URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>移除 URL.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation>日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>更新中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>选择路径</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>URL下载优先次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>预览</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>自动下载预览</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>预览位置:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>最后变更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <source>Spoilers download automatically on launch</source>
         <translation>开啟时自动下载预览</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <source>Press the button to manually update without relaunching</source>
         <translation>免重新啟动人手按制更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Download card pictures on the fly</source>
         <translation>即时下载卡牌图片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <source>How to add a custom URL</source>
         <translation>如何添加自定URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>删除已下载的图片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>重置下载URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation>下载图片专用硬盘缓储</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>现不在萤光幕上记忆中图片缓储</translation>
     </message>
@@ -1467,32 +1484,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation>数目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation>牌组</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>号码</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation>提供者 id</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>卡牌</translation>
     </message>
@@ -1528,12 +1545,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1750,32 +1767,32 @@ 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/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation>解锁锁上</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <source>The selected file could not be loaded.</source>
         <translation>选择的档案不能再入</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2867,17 +2884,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <source>Load deck from clipboard</source>
         <translation>从剪贴板载入牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>牌表不能载入</translation>
     </message>
@@ -2885,43 +2902,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2940,73 +2957,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation>卡牌名称(或搜寻表达式)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation>因为cockatrice原生没有ssl支援, 所以你不能自动下载更新. 请瀏览到我们的下载网页,进行人手更新.</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation>开关副牌上锁</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <source>Put top cards on stack until...</source>
         <translation>把顶牌放在重迭区, 直到...</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation>筛选无效</translation>
     </message>
@@ -3169,12 +3153,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <source>Unknown Error loading card database</source>
         <translation>读取卡牌资料库时出现不知名错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3191,7 +3175,7 @@ Would you like to change your database location setting?</source>
 你想要重新设置卡牌资料库路径吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3208,7 +3192,7 @@ 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="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3221,7 +3205,7 @@ Would you like to change your database location setting?</source>
 你想要重新设置卡牌资料库路径吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3229,7 +3213,7 @@ Would you like to change your database location setting?</source>
 你想要重新设置卡牌资料库路径吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3238,7 +3222,7 @@ Would you like to change your database location setting?</source>
 你想要重新设置卡牌资料库路径吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3254,59 +3238,59 @@ https://github.com/Cockatrice/Cockatrice/issues
 你想不想更改你的资料库位置设定?</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</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="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>外观</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>用户界面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>卡牌来源</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>声音</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>快捷键</translation>
     </message>
@@ -3620,67 +3604,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4128,143 +4112,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>选择路径</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>个人设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>语言:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <source>Decks directory:</source>
         <translation>牌库路径:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <source>Replays directory:</source>
         <translation>游戏录像目录:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
         <source>Pictures directory:</source>
         <translation>图片目录:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
         <source>Card database:</source>
         <translation>卡牌资料库：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <source>Token database:</source>
         <translation>令牌资料库:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
         <source>Update channel</source>
         <translation>更新渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4272,47 +4256,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4320,88 +4304,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4409,52 +4393,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4462,213 +4446,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4762,8 +4726,18 @@ Will now login.</source>
 现在登入.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>玩家人数</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation>请输入玩家人数</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>玩家 %1</translation>
     </message>
@@ -4866,8 +4840,8 @@ Will now login.</source>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
@@ -5273,36 +5247,36 @@ Local version is %1, remote version is %2.</source>
         <translation>显示/隐藏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice 已被安装</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>卡牌资料库</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5311,29 +5285,29 @@ If unsure or first time user, choose &quot;Yes&quot;</source>
 如果不确定, 或者是第一次使用，请选择“是/Yes”</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>打开设置</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>发现新卡组</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5342,17 +5316,17 @@ Do you want to enable it/them?</source>
 要啟用它们吗？</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>查看卡组</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>欢迎</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5361,64 +5335,64 @@ Read more about changing the set order or disabling specific sets and consequent
 请阅读,了解更多在“卡组设置”对话框裡.更改卡组顺序或者禁用某些卡组的功能.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <source>A card database update is already running.</source>
         <translation>资料库更新现已进行.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <source>Unable to run the card database updater: </source>
         <translation>不能运行卡牌资料附更新程式:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5430,54 +5404,54 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 请到&quot;援助-&gt;检查更新&quot;去更新你的客户端.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>载入卡组/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation>找不到选择的文件。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <source>You can only import XML databases at this time.</source>
         <translation>你暂时只能导入xml资料库.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>卡组/卡牌导入失败.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation>重设密码</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
         <translation>你的密码已经成功重置, 你可以用新密码重新登入。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
         <translation>重置用户密码失败, 请联络伺服器管责人重置密码.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation>已经收到啟动要求,   请从你的电邮获取啟动验证码.</translation>
     </message>
@@ -5528,7 +5502,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5682,610 +5656,590 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>从战场上</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation>从它们的坟场</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation>从放逐区</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation>从它们的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source>the top card of their library</source>
         <translation>它们的顶牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <source> from the top of their library</source>
         <translation>从它们1牌库顶</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source>the bottom card of their library</source>
         <translation>它们牌库的底牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation>从它们的牌库底</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s library</source>
         <translation>从%1的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>从它们的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation>从备牌中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation>从迭区中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</source>
         <translation> %1 在此游戏宣佈降服.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <source>%1 has unconceded the game.</source>
         <translation> %1 收回在此游戏降服.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1已恢復连接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 已失去连接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 派出令牌: %2%3</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 已载入牌库(%2)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1销毁了%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>一张牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="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>%1 放逐%2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1使出 %2%3。</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation>底部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation>顶部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1把%2翻为面朝下。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1把%2翻为面朝上。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <source>The game has been closed.</source>
         <translation>游戏已经关闭。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>游戏已开始。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <source>%1 has joined the game.</source>
         <translation>%1 已经加入游戏。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 正在旁观游戏。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出游戏。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 已经离开游戏(%2)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1已準备好开始游戏。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <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="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1把%2展示给%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 展示 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1随机展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>逆转</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>正常</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>正面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>翻面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>轮到 %1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 将 %2 设置为照常重置。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 移除%2的力量/防御.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1已经锁定它们的的副牌库。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1已经把它们的的副牌库解锁。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>%1横置它们的永久卡牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1重置它们的永久卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 横置 %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 重置 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>% 1 对 %2  洗牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 取消了%2的结附。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 放回它们最后一张抽到的卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation> %1 放回它们最后一张抽到的卡牌(%2).</translation>
     </message>
@@ -6293,110 +6247,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>词1 词2 词3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>添加新信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation>移除信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>添加信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>聊天设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>自定通知触发词语</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>允许聊天中提到某人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>允许自动完成提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation>游戏内短信速键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation>如何使用游戏内短信速键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>不要显示未註册用户的聊天消息。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>不要显示未註册用户的私人消息.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>反转文本顏色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>容许桌面提醒提及私人消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Enable desktop notification for mentions</source>
         <translation>容许桌面提醒提及聊天提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable room message history on join</source>
         <translation>加入聊天室时开启消息历史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>（顏色为16进制）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>将单词以空格区分，仅支持字母.</translation>
     </message>
@@ -6409,37 +6363,32 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6581,57 +6530,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>重置步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>维持步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>抓牌步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>第一主阶段</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>战斗开始步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>宣告阻挡步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>宣告阻挡步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>战斗损害步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>战斗结束步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>第二主阶段</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>回合完结部</translation>
     </message>
@@ -6648,138 +6597,134 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6787,65 +6732,48 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation>喜好</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation>版本上别针</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation>版本脱别针</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation>显示关联卡牌</translation>
     </message>
@@ -6894,25 +6822,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation>发行日期</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation>由后到先</translation>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7051,33 +6971,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7226,37 +7119,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7299,14 +7192,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>游戏(眾)</translation>
     </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>
@@ -7371,53 +7256,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation>恢復所有常用快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation>清除所有常用快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>确认清除所有快键吗?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>部分：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>行动:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>快键:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation>如何设置自定快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation>清除所有快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation>按快键名称搜寻</translation>
     </message>
@@ -7486,27 +7371,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>启用&amp;声效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>现前声效主题：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation>测试系统声效引擎</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>声效设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>主音量</translation>
     </message>
@@ -7722,123 +7607,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7846,52 +7667,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>卡牌资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>筛选项目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>&amp;视图</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation>印刷版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>可见</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>浮动</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>重置布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>牌库:%1</translation>
     </message>
@@ -7899,55 +7728,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -8012,7 +7847,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>新文件夹</translation>
     </message>
@@ -8093,18 +7928,18 @@ Please enter a name:</source>
         <translation>你确定要删除被选档案(眾)吗 ？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation>删除伺服器上的牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>新建文件夹名称:</translation>
     </message>
@@ -8122,12 +7957,12 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8176,191 +8011,197 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>游戏录像重温</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>玩家列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>卡牌资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</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="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>录像时间线</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</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="289"/>
         <source>&amp;Game</source>
         <translation>游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</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="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</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="300"/>
         <source>Reverse turn order</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="303"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;移除所有自设箭头</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="306"/>
         <source>Rotate View Cl&amp;ockwise</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="309"/>
         <source>Rotate View Co&amp;unterclockwise</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="312"/>
         <source>Game &amp;information</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="315"/>
         <source>Un&amp;concede</source>
         <translation>撤销&amp;投降</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>&amp;投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>&amp;离开游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;关闭游戏录像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation>&amp;説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation>&amp;视图</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>可见</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>浮动</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>重置布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>撤销投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>离开游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation>有玩家加入游戏 #%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the game</source>
         <translation>%1 已经加入游戏。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出游戏。</translation>
     </message>
@@ -9460,152 +9301,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>一般通用接口设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <source>Annotate card text on tokens</source>
         <translation>在令牌上标註牌中文字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>通告设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation>开启任务栏通告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>动画设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;横置/重置 动画</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <source>Open deck in new tab by default</source>
         <translation>把用新页开啟牌库作为常用设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation>重播设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>用速键啟动向后跳的缓衝时间:</translation>
     </message>
@@ -9669,24 +9500,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9713,108 +9543,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9822,32 +9569,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9883,7 +9620,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9891,19 +9628,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9911,37 +9648,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9955,22 +9682,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9978,64 +9735,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10043,17 +9792,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10069,52 +9818,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10215,133 +9959,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <source>Move selected set to the top</source>
         <translation>将选择的牌组送到最顶</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation>将选择的牌组往上一格</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation>将选择的牌组往下一格</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <source>Move selected set to the bottom</source>
         <translation>将选择的牌组送到最底</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <source>Search by set name, code, or type</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="71"/>
         <source>Default order</source>
         <translation>常用次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation>恢復常用艺术先后次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>啟用所有牌组</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>禁用所有卡组</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation>啟用选择的牌组(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation>停用选择的牌组(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>牌库编辑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>卡牌艺术</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="135"/>
         <source>How to use custom card art</source>
         <translation>如何使用自定卡牌图片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>笔记</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>管理牌组</translation>
     </message>
@@ -10349,72 +10093,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</source>
         <translation>未分组</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Group by Type</source>
         <translation>按类型分组</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <source>Group by Mana Value</source>
         <translation>按法力数值分组</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Color</source>
         <translation>按顏色排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</source>
         <translation>未排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Sort by Name</source>
         <translation>按名称排次序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Type</source>
         <translation>按类型排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation>按法力费用排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation>按顏色(眾) 排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation>按力量/防御力排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation>按排组排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>关闭界面时洗牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>栋迭观看</translation>
     </message>
@@ -10449,7 +10193,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>牌库编辑</translation>
     </message>
@@ -10530,7 +10274,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation>游戏录像</translation>
     </message>
@@ -10682,7 +10426,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>重置佈局</translation>
     </message>
@@ -11103,9 +10847,8 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <source>Toggle Untap</source>
+        <translation>锁定重置状态</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11124,102 +10867,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <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>结附牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>解除牌结附</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>复製卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>派出令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>派出所有相关令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>再做另外令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>记下註解</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation>选择所有在区域的牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation>选择所有横行牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation>选择所有直行牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>牌库底</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>放逐</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>坟场</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>手牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>牌库顶</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>战场，面朝下</translation>
     </message>
@@ -11255,246 +10994,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>迭区</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation>多张送坟场</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation>多张放逐</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation>找到以下牌前全送迭区</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation>从牌库底抽一张牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>从牌库底抽超过一张牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>画箭咀</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation>清除自设箭咀</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>离开游戏</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>掷骰</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>洗牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>再调度</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>抽一张牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>抽超过一张牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>撤销抽牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>永远显示顶牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>永远看到顶牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>视角顺时针转</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>视角逆时针转</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>取消聚焦文本框</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>聚焦聊天</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>扫清聊天</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>刷新</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation>跳前</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation>跳后</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation>向前大跳</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation>向后大跳</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation>播放/暂停</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation>切换快进</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_zh-Hant.ts b/cockatrice/translations/cockatrice_zh-Hant.ts
index 1980960a9..ce3fa8f00 100644
--- a/cockatrice/translations/cockatrice_zh-Hant.ts
+++ b/cockatrice/translations/cockatrice_zh-Hant.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="25"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,60 +36,60 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="215"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="239"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="240"/>
         <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="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="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"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="335"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="365"/>
+        <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="507"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="294"/>
         <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="338"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="310"/>
         <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="391"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="366"/>
         <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="374"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="348"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="384"/>
         <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="532"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="507"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
@@ -131,168 +131,190 @@ 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="446"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="444"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="649"/>
         <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="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="665"/>
+        <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="672"/>
+        <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="681"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Theme settings</source>
         <translation>主題設定</translation>
     </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>Current theme:</source>
         <translation>當前主題</translation>
     </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>Open themes folder</source>
         <translation>打開主題文件夾</translation>
     </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>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="731"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="735"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
         <source>Card rendering</source>
         <translation>牌面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
         <source>Display card names on cards having a picture</source>
         <translation>顯示有圖卡牌的名稱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="741"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
         <source>Scale cards on mouse over</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="745"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
         <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"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="751"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="753"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
         <source>Counter %1</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="760"/>
         <source>Hand layout</source>
         <translation>手牌區域佈局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>水平顯示手牌區域 (浪費空間)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
         <source>Enable left justification</source>
         <translation>開啓左對齊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Table grid layout</source>
         <translation>表格佈局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Invert vertical coordinate</source>
         <translation>反轉垂直坐標</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>界面佈局之內能夠容納的玩家欄數量：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="767"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>卡牌上顯示的最大字號</translation>
     </message>
@@ -300,12 +322,7 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>ArchidektApiResponseDeckDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="83"/>
         <source>Open Deck in Deck Editor</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +642,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="375"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="363"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="408"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="421"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="427"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -676,124 +693,124 @@ 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="276"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="277"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="351"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="399"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="416"/>
         <source>All tokens</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="439"/>
         <source>&amp;Select All</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="440"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
         <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="455"/>
-        <source>Skip &amp;untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <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="460"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="458"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="466"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="469"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -809,133 +826,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="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="176"/>
         <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="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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="184"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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="186"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="187"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <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="186"/>
+        <source>their library</source>
+        <comment>reveal zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <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="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="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="192"/>
-        <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <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="194"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="191"/>
         <source>their library</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/logic/card_zone_logic.cpp" line="191"/>
         <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="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="196"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="200"/>
         <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="201"/>
+        <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="203"/>
+        <source>their sideboard</source>
+        <comment>nominative</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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="209"/>
         <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="213"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="210"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -997,7 +1014,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardDatabaseDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="50"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
@@ -1005,7 +1022,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1028,32 +1045,32 @@ 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/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <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="197"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="199"/>
         <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="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="243"/>
         <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="242"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="244"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,32 +1078,32 @@ 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="131"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="132"/>
         <source>Loading Database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="154"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="178"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="717"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +1176,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="137"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="138"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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="140"/>
         <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="140"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1309,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="49"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="44"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,166 +1317,166 @@ 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="1250"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Update Spoilers</source>
         <translation>更新預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1133"/>
         <source>Download URLs have been reset.</source>
         <translation>下載URL已重置。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1169"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation>下載的卡牌圖片已被重置。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1172"/>
         <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="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Add URL</source>
         <translation>添加URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1179"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1199"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>Edit URL</source>
         <translation>編輯URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <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="1311"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Add New URL</source>
         <translation>添加新的URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Remove URL</source>
         <translation>移除URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
         <source>Updating...</source>
         <translation>更新中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1258"/>
         <source>Choose path</source>
         <translation>選擇路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
         <source>URL Download Priority</source>
         <translation>URL下載優先級</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Spoilers</source>
         <translation>預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
         <source>Download Spoilers Automatically</source>
         <translation>自動下載預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
         <source>Spoiler Location:</source>
         <translation>預覽位置:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Last Change</source>
         <translation>最近的變更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
         <source>Spoilers download automatically on launch</source>
         <translation>自動下載預覽運行</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
         <source>Press the button to manually update without relaunching</source>
         <translation>按下按鈕手動更新而不重新啓動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
         <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="1303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Download card pictures on the fly</source>
         <translation>即時下載卡牌圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
         <source>How to add a custom URL</source>
         <translation>如何添加自定義URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
         <source>Delete Downloaded Images</source>
         <translation>刪除已下載的圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>Reset Download URLs</source>
         <translation>重置用於下載的URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1467,32 +1484,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="55"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
         <source>Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
         <source>Undo/Redo history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
         <source>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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="70"/>
         <source>[redo] </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="87"/>
         <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
@@ -1500,27 +1517,27 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="209"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Number</source>
         <translation>數量</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Card</source>
         <translation>卡牌</translation>
     </message>
@@ -1528,12 +1545,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="26"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,94 +1647,94 @@ 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="59"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="322"/>
         <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="398"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="325"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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="409"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="342"/>
         <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="420"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="349"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="364"/>
         <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="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="382"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="402"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="415"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="429"/>
         <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="511"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1750,32 +1767,32 @@ 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/deck_editor/deck_state_manager.cpp" line="182"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="178"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="253"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="271"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="295"/>
         <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"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="296"/>
         <source>Removed</source>
         <translation type="unfinished"/>
     </message>
@@ -1842,29 +1859,29 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation>鎖定備牌</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="268"/>
         <source>The selected file could not be loaded.</source>
         <translation>此文件無法被載入</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="280"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="343"/>
         <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="344"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="345"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -2357,17 +2374,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="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="142"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="171"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2868,17 +2885,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="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="113"/>
         <source>Load deck from clipboard</source>
         <translation>從剪貼板讀取套牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="128"/>
         <source>Invalid deck list.</source>
         <translation>無效的牌表.</translation>
     </message>
@@ -2886,43 +2903,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="44"/>
         <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="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"/>
+        <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="80"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="126"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
         <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="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="80"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="94"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2941,73 +2958,40 @@ https://tappedout.net/mtg-decks/your-deck-name/</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="17"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="27"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="37"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="52"/>
         <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="82"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="83"/>
         <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="84"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="85"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="97"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3168,12 +3152,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1872"/>
         <source>Unknown Error loading card database</source>
         <translation>讀取卡牌數據庫時出現未知錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1880"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3190,7 +3174,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1897"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1886"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3207,7 +3191,7 @@ 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="1892"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3216,7 +3200,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="1909"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1898"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3225,7 +3209,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌數據庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1902"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3234,7 +3218,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1917"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3243,59 +3227,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="1925"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1934"/>
         <source>Error</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="1925"/>
         <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="1946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
         <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="1958"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1947"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1949"/>
         <source>General</source>
         <translation>常規</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1950"/>
         <source>Appearance</source>
         <translation>外觀</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1951"/>
         <source>User Interface</source>
         <translation>用戶界面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1952"/>
         <source>Card Sources</source>
         <translation>卡牌的來源</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1953"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1954"/>
         <source>Sound</source>
         <translation>聲音</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1955"/>
         <source>Shortcuts</source>
         <translation>快捷鍵</translation>
     </message>
@@ -3609,67 +3593,67 @@ You may have to manually download the new version.</source>
 <context>
     <name>DrawProbabilityWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <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="102"/>
+        <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="104"/>
+        <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="105"/>
+        <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="106"/>
+        <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="107"/>
+        <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="109"/>
+        <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="110"/>
+        <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="112"/>
+        <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="113"/>
+        <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="115"/>
+        <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="115"/>
+        <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="115"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
         <source>Odds (%)</source>
         <translation type="unfinished"/>
     </message>
@@ -4117,143 +4101,143 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="198"/>
         <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation>選擇路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="361"/>
         <source>Personal settings</source>
         <translation>個人設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation>語言:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="365"/>
         <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/dialogs/dlg_settings.cpp" line="367"/>
         <source>Paths</source>
         <translation>路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="370"/>
         <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/dialogs/dlg_settings.cpp" line="371"/>
         <source>Decks directory:</source>
         <translation>套牌路徑:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <source>Replays directory:</source>
         <translation>遊戲錄像目錄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
         <source>Pictures directory:</source>
         <translation>圖片目錄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
         <source>Card database:</source>
         <translation>卡牌數據庫:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
         <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/dialogs/dlg_settings.cpp" line="377"/>
         <source>Token database:</source>
         <translation>衍生物數據庫：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
         <source>Update channel</source>
         <translation>更新通道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
         <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/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="383"/>
         <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/dialogs/dlg_settings.cpp" line="385"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
         <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/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
@@ -4261,47 +4245,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/player/menu/grave_menu.cpp" line="97"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="99"/>
         <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/player/menu/grave_menu.cpp" line="102"/>
         <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/player/menu/grave_menu.cpp" line="103"/>
         <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/player/menu/grave_menu.cpp" line="104"/>
         <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/player/menu/grave_menu.cpp" line="72"/>
         <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/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game/player/menu/grave_menu.cpp" line="108"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4309,88 +4293,88 @@ 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="108"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="107"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="110"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="112"/>
         <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="117"/>
         <source>Take &amp;mulligan (Choose hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
         <source>Take mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
         <source>Take mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="121"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
         <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="130"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -4398,52 +4382,52 @@ You may have to manually download the new version.</source>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="199"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
         <source>Browse Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="205"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="209"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="224"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="228"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="234"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4451,213 +4435,193 @@ 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="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
         <source>&amp;Library</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="195"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
         <source>View &amp;top cards of library...</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="197"/>
         <source>View bottom cards of library...</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="198"/>
         <source>Reveal &amp;library to...</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="199"/>
         <source>Lend library to...</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="200"/>
         <source>Reveal &amp;top cards to...</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="201"/>
         <source>&amp;Top of library...</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="202"/>
         <source>&amp;Bottom of library...</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="203"/>
         <source>&amp;Always reveal top card</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="204"/>
         <source>&amp;Always look at top card</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="205"/>
         <source>&amp;Open deck in deck editor</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="207"/>
         <source>&amp;Draw 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="208"/>
         <source>D&amp;raw 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="209"/>
         <source>&amp;Undo last draw</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="211"/>
         <source>Shuffle</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="213"/>
         <source>&amp;Play top card</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="214"/>
         <source>Play top card &amp;face down</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="215"/>
         <source>Put top card on &amp;bottom</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="216"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4751,8 +4715,18 @@ Will now login.</source>
 現在登陸</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Number of players</source>
+        <translation>玩家人數</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="230"/>
+        <source>Please enter the number of players.</source>
+        <translation>請輸入玩家的數量.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="247"/>
+        <location filename="src/interface/window_main.cpp" line="254"/>
         <source>Player %1</source>
         <translation>玩家 %1</translation>
     </message>
@@ -4855,8 +4829,8 @@ Will now login.</source>
         <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"/>
+        <location filename="src/interface/window_main.cpp" line="1276"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
@@ -5263,36 +5237,36 @@ Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <source>New Version</source>
         <translation>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/interface/window_main.cpp" line="1010"/>
         <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="1016"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
         <source>Cockatrice installed</source>
         <translation>雞蛇已安裝</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <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="1151"/>
+        <location filename="src/interface/window_main.cpp" line="1149"/>
         <source>Card database</source>
         <translation>卡牌數據庫</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <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>
@@ -5301,46 +5275,46 @@ If unsure or first time user, choose &quot;Yes&quot;</source>
 如果不確定或者你是第一次使用，請選擇“是”</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
+        <location filename="src/interface/window_main.cpp" line="1180"/>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1158"/>
-        <location filename="src/interface/window_main.cpp" line="1183"/>
+        <location filename="src/interface/window_main.cpp" line="1156"/>
+        <location filename="src/interface/window_main.cpp" line="1181"/>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
         <source>Open settings</source>
         <translation>打開設定</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/interface/window_main.cpp" line="1172"/>
         <source>New sets found</source>
         <translation>發現新系列</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <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="1184"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>View sets</source>
         <translation>查看系列</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/interface/window_main.cpp" line="1201"/>
         <source>Welcome</source>
         <translation>歡迎</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/interface/window_main.cpp" line="1202"/>
         <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>
@@ -5349,64 +5323,64 @@ Read more about changing the set order or disabling specific sets and consequent
 瞭解更多用“系列管理”窗口更改系列順序或者禁用某系列的信息。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
+        <location filename="src/interface/window_main.cpp" line="1382"/>
         <source>Information</source>
         <translation>信息</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1222"/>
         <source>A card database update is already running.</source>
         <translation>數據庫更新已經在運行中。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
+        <location filename="src/interface/window_main.cpp" line="1277"/>
         <source>Unable to run the card database updater: </source>
         <translation>無法運行卡組數據庫更新器：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/interface/window_main.cpp" line="1286"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/interface/window_main.cpp" line="1304"/>
         <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="1309"/>
+        <location filename="src/interface/window_main.cpp" line="1307"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/interface/window_main.cpp" line="1311"/>
         <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="1316"/>
+        <location filename="src/interface/window_main.cpp" line="1314"/>
         <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="1320"/>
+        <location filename="src/interface/window_main.cpp" line="1318"/>
         <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="1325"/>
+        <location filename="src/interface/window_main.cpp" line="1323"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/interface/window_main.cpp" line="1328"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/interface/window_main.cpp" line="1383"/>
         <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.
 
@@ -5416,55 +5390,55 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 要升級客户端，請點擊 幫助-&gt;檢查更新</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1402"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
+        <location filename="src/interface/window_main.cpp" line="1445"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Load sets/cards</source>
         <translation>載入系列/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1411"/>
         <source>Selected file cannot be found.</source>
         <translation>找不到選擇的文件。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1417"/>
         <source>You can only import XML databases at this time.</source>
         <translation>當前只能導入XML格式數據庫。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/interface/window_main.cpp" line="1446"/>
         <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="1451"/>
+        <location filename="src/interface/window_main.cpp" line="1449"/>
         <source>Sets/cards failed to import.</source>
         <translation>系列/卡牌導入失敗。</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1510"/>
+        <location filename="src/interface/window_main.cpp" line="1519"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/interface/window_main.cpp" line="1501"/>
         <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
         <translation>你的密碼已重置，現在你可以使用新密碼登錄了。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
+        <location filename="src/interface/window_main.cpp" line="1511"/>
         <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
         <translation>重置密碼失敗，請聯繫伺服器管理員重置密碼。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/interface/window_main.cpp" line="1520"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation>激活請求已收到，請查看你的電子郵箱獲取激活驗證碼。</translation>
     </message>
@@ -5515,7 +5489,7 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="16"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5669,610 +5643,590 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="41"/>
         <source> from play</source>
         <translation>從戰場上</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
         <source> from their graveyard</source>
         <translation>從他的墳墓場</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source> from exile</source>
         <translation>從放逐區</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source> from their hand</source>
         <translation>從他的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <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="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source>the top card of their library</source>
         <translation>他牌庫頂的卡牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="59"/>
         <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="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
         <source> from the top of their library</source>
         <translation>從他的牌庫頂</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <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="62"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source>the bottom card of their library</source>
         <translation>他牌庫底部的牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <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="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from the bottom of their library</source>
         <translation>從他的牌庫底</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="81"/>
         <source> from %1&apos;s library</source>
         <translation>從%1的牌庫中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
         <source> from their library</source>
         <translation>從他的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="87"/>
         <source> from sideboard</source>
         <translation>從備牌中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
         <source> from the stack</source>
         <translation>從堆疊中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="117"/>
         <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="111"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <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="118"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="125"/>
         <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="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <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="126"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="133"/>
         <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="137"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="144"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 已放棄遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="153"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 已放棄遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="163"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1已恢復連接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="167"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 已失去連接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="183"/>
         <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="179"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="186"/>
         <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="184"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="191"/>
         <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="189"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="196"/>
         <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="197"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="204"/>
         <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="201"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="208"/>
         <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="207"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="214"/>
         <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="213"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="220"/>
         <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="227"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="234"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1創建衍生物：%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="247"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 已載入套牌(%2)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="242"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
         <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="252"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="259"/>
         <source>%1 destroys %2.</source>
         <translation>%1銷燬了%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="294"/>
         <source>a card</source>
         <translation>一張牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="300"/>
         <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="305"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="312"/>
         <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="307"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
         <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="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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
         <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="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>%1 %3放逐了 %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
         <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="325"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="324"/>
         <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="327"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
         <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="329"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
         <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="333"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="332"/>
         <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="336"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="335"/>
         <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"/>
-        <source>%1 plays %2%3 face down.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="338"/>
         <source>%1 plays %2%3.</source>
         <translation>%1使用 %2%3。</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="341"/>
         <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="370"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="361"/>
         <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="372"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
         <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="382"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="373"/>
         <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="387"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="378"/>
         <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="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="390"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1回合%2翻為面朝下。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="393"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1回合%2翻為面朝上。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <source>The game has been closed.</source>
         <translation>遊戲已經關閉。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="404"/>
         <source>The game has started.</source>
         <translation>遊戲已開始。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="409"/>
         <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="424"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="415"/>
         <source>%1 has joined the game.</source>
         <translation>%1 已經加入遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="421"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 正在旁觀遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="435"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="426"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="441"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="432"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 已經離開了遊戲(%2)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="440"/>
         <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="456"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="447"/>
         <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="465"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <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="470"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="461"/>
         <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="476"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="467"/>
         <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="481"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="472"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1已準備好開始遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="507"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="498"/>
         <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="509"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
         <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="518"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="514"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1將%2展示給%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="520"/>
         <source>%1 reveals %2.</source>
         <translation>%1 展示 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="526"/>
         <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="541"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="532"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1隨機展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="540"/>
         <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="553"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="544"/>
         <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="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="550"/>
         <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="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="557"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="564"/>
         <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="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation>反轉</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation>正常</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation>正面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation>反面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <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="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="579"/>
         <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="595"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="586"/>
         <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="605"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="596"/>
         <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="633"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="624"/>
         <source>%1&apos;s turn.</source>
         <translation>現在是%1的回合。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="630"/>
         <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="650"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="641"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="661"/>
         <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="682"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="673"/>
         <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="684"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 將 %2 設置為可通常重置。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="694"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 移除%2力量/防禦</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="699"/>
         <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="711"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="702"/>
         <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="720"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1已鎖定他的備牌。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="714"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 解除鎖定他的備牌。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 橫置了永久物。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="732"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 重置了永久物。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 taps %2.</source>
         <translation>%1 橫置了 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="735"/>
         <source>%1 untaps %2.</source>
         <translation>%1 重置了 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="751"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 切洗了%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="755"/>
         <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="769"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <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="774"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="765"/>
         <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="789"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="780"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 取消了%2的結附。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="788"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1撤銷了最後的抓牌。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="791"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1撤銷了最後的抓牌(%2)。</translation>
     </message>
@@ -6280,110 +6234,110 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Word1 Word2 Word3</source>
         <translation>詞1 詞2 詞3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Add New Message</source>
         <translation>添加新信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Edit Message</source>
         <translation>編輯信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Add message</source>
         <translation>添加信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1497"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Message:</source>
         <translation>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1510"/>
         <source>Edit message</source>
         <translation>編輯消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
         <source>Chat settings</source>
         <translation>聊天設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
         <source>Custom alert words</source>
         <translation>自定義警告語</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
         <source>Enable chat mentions</source>
         <translation>允許聊天中提到某人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
         <source>Enable mention completer</source>
         <translation>允許自動完成提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
         <source>In-game message macros</source>
         <translation>遊戲內消息宏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>忽略未註冊用戶的聊天室消息。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>忽略未註冊用戶發出的私人消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1538"/>
         <source>Invert text color</source>
         <translation>反轉文本顏色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>開啓私人消息桌面提醒</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Enable desktop notification for mentions</source>
         <translation>開啓聊天提名桌面提醒</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable room message history on join</source>
         <translation>開啓加入聊天室時的歷史消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>(Color is hexadecimal)</source>
         <translation>（顏色為16進制）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>將單詞以空格區分，僅支持字母</translation>
     </message>
@@ -6396,37 +6350,32 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -6568,57 +6517,57 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/game/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>重置步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
+        <location filename="src/game/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>維持步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
+        <location filename="src/game/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>抓牌步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
+        <location filename="src/game/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation>主要步驟1</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/game/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>戰鬥開始步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/game/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>宣告進攻步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/game/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>宣告阻擋步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/game/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>戰鬥傷害步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/game/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>戰鬥結束步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/game/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation>主要步驟2</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/game/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>結束步驟</translation>
     </message>
@@ -6635,138 +6584,134 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
+        <location filename="src/game/player/player_actions.cpp" line="179"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/game/player/player_actions.cpp" line="180"/>
+        <location filename="src/game/player/player_actions.cpp" line="193"/>
+        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="282"/>
+        <location filename="src/game/player/player_actions.cpp" line="317"/>
+        <location filename="src/game/player/player_actions.cpp" line="362"/>
+        <location filename="src/game/player/player_actions.cpp" line="434"/>
+        <location filename="src/game/player/player_actions.cpp" line="466"/>
+        <location filename="src/game/player/player_actions.cpp" line="638"/>
+        <location filename="src/game/player/player_actions.cpp" line="670"/>
+        <location filename="src/game/player/player_actions.cpp" line="787"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player_actions.cpp" line="192"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player_actions.cpp" line="252"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
+        <location filename="src/game/player/player_actions.cpp" line="281"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
+        <location filename="src/game/player/player_actions.cpp" line="316"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player_actions.cpp" line="318"/>
         <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="357"/>
+        <location filename="src/game/player/player_actions.cpp" line="361"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <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="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>
+        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="465"/>
+        <source>Move top cards to exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
+        <location filename="src/game/player/player_actions.cpp" line="637"/>
+        <source>Move bottom cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
+        <location filename="src/game/player/player_actions.cpp" line="669"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player_actions.cpp" line="786"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
+        <location filename="src/game/player/player_actions.cpp" line="890"/>
+        <location filename="src/game/player/player_actions.cpp" line="936"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1064"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
+        <location filename="src/game/player/player_actions.cpp" line="1230"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player_actions.cpp" line="1231"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player_actions.cpp" line="1390"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player_actions.cpp" line="1510"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player_actions.cpp" line="1511"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player_actions.cpp" line="1604"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6774,65 +6719,48 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="100"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="117"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </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/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
+        <location filename="src/game/player/menu/player_menu.cpp" line="134"/>
+        <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="88"/>
         <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="199"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="205"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="213"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="220"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="228"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6881,25 +6809,17 @@ This setting means you'll only see the default printing for each card, instead o
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="51"/>
         <source>Descending</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="49"/>
         <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>
@@ -7038,33 +6958,6 @@ This setting means you'll only see the default printing for each card, instead o
         <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>
@@ -7213,37 +7106,37 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;View exile</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="63"/>
         <source>&amp;Move exile to...</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="64"/>
         <source>&amp;Top of library</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="65"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -7286,14 +7179,6 @@ Are you sure you would like to disable this feature?</source>
         <translation>遊戲</translation>
     </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>
@@ -7358,53 +7243,53 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1720"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1743"/>
         <source>Restore all default shortcuts</source>
         <translation>恢復所有默認快捷鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1721"/>
         <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="1739"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
         <source>Clear all default shortcuts</source>
         <translation>清楚所有默認快捷鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>確定要清楚所有快捷鍵？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1749"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1738"/>
         <source>Section:</source>
         <translation>部分:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Action:</source>
         <translation>行動:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Shortcut:</source>
         <translation>快捷鍵:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1742"/>
         <source>How to set custom shortcuts</source>
         <translation>如何設置自定義快捷鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1744"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1745"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7473,27 +7358,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1622"/>
         <source>Enable &amp;sounds</source>
         <translation>啓用聲效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1623"/>
         <source>Current sounds theme:</source>
         <translation>當前聲效主題：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Test system sound engine</source>
         <translation>測試系統聲效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1625"/>
         <source>Sound settings</source>
         <translation>聲效設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1626"/>
         <source>Master volume</source>
         <translation>主音量</translation>
     </message>
@@ -7709,123 +7594,59 @@ Please check your shortcut settings!</source>
 <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="64"/>
         <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>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="348"/>
+        <source>Any Bracket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="129"/>
+        <source>Deck name contains...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="133"/>
+        <source>Owner name contains...</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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="298"/>
         <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"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="299"/>
         <source>Formats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="300"/>
+        <source>Min. # of Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="301"/>
+        <source>Page:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="79"/>
         <source>Archidekt: </source>
         <translation type="unfinished"/>
     </message>
@@ -7833,52 +7654,60 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
         <source>Card Info</source>
         <translation>卡牌信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
         <source>Deck</source>
         <translation>套牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
         <source>Filters</source>
         <translation>過濾器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
         <source>&amp;View</source>
         <translation>視圖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="145"/>
         <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="148"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="154"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="158"/>
         <source>Visible</source>
         <translation>可見</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="153"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="155"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="157"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="159"/>
         <source>Floating</source>
         <translation>移動窗口</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="160"/>
         <source>Reset layout</source>
         <translation>重置界面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Deck: %1</source>
         <translation>套牌: %1</translation>
     </message>
@@ -7886,55 +7715,61 @@ 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="118"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="153"/>
         <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="297"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="387"/>
         <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="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="389"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="394"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="395"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="391"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="396"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="393"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="397"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="399"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="402"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="405"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="408"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="400"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="403"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="406"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="409"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="411"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7999,7 +7834,7 @@ Please check your shortcut settings!</source>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>New folder</source>
         <translation>新建文件夾</translation>
     </message>
@@ -8081,18 +7916,18 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="549"/>
         <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="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="513"/>
         <source>Name of new folder:</source>
         <translation>新建文件夾的名稱:</translation>
     </message>
@@ -8110,12 +7945,12 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="29"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8164,191 +7999,197 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="908"/>
         <source>Replay</source>
         <translation>錄像</translation>
     </message>
     <message>
-        <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="264"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="274"/>
         <source>Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="268"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="341"/>
         <source>Player List</source>
         <translation>玩家列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>Card Info</source>
         <translation>卡牌信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>Messages</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="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="353"/>
         <source>Replay Timeline</source>
         <translation>錄像時間線</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
         <source>&amp;Phases</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="289"/>
         <source>&amp;Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>Next &amp;phase</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="294"/>
         <source>Next phase with &amp;action</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="297"/>
         <source>Next &amp;turn</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="300"/>
         <source>Reverse turn order</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="303"/>
         <source>&amp;Remove all local arrows</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="306"/>
         <source>Rotate View Cl&amp;ockwise</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="309"/>
         <source>Rotate View Co&amp;unterclockwise</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="312"/>
         <source>Game &amp;information</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="315"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="821"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="842"/>
         <source>&amp;Concede</source>
         <translation>放棄遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>&amp;Leave game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>C&amp;lose replay</source>
         <translation>關閉遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="328"/>
         <source>&amp;Focus Chat</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="331"/>
         <source>&amp;Say:</source>
         <translation>説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="335"/>
         <source>Selected cards</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="338"/>
         <source>&amp;View</source>
         <translation>視圖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
         <source>Visible</source>
         <translation>可見</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Floating</source>
         <translation>移動窗口</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
         <source>Reset layout</source>
         <translation>重置界面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="490"/>
         <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="492"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="496"/>
         <source>Unconcede</source>
         <translation>取消投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="497"/>
         <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="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <source>Leave game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="515"/>
         <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="626"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="631"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="632"/>
         <source>%1 has joined the 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="641"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出遊戲。</translation>
     </message>
@@ -9450,152 +9291,142 @@ 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="960"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
         <source>General interface settings</source>
         <translation>通用接口設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
         <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="962"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
         <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="963"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
         <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="964"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
         <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="966"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
         <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="967"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
         <source>Annotate card text on tokens</source>
         <translation>用卡牌信息給衍生物標注</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <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>Show total selection counter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="959"/>
         <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="971"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>Notifications settings</source>
         <translation>通知設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>Enable notifications in taskbar</source>
         <translation>開啓任務欄提醒</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <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="974"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <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="975"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
         <source>Animation settings</source>
         <translation>動畫設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>&amp;Tap/untap animation</source>
         <translation>橫置/重置 動畫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
         <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="981"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9659,24 +9490,23 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="51"/>
+        <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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>
+        <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="57"/>
+        <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="61"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -9703,108 +9533,25 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="57"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="58"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="166"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9812,32 +9559,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <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"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <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="177"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9873,7 +9610,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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9881,19 +9618,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="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <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="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9901,37 +9638,27 @@ 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="26"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
         <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="74"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <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="185"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9945,22 +9672,52 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </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"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="296"/>
         <source>Visual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="266"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="268"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="270"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="271"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="273"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="274"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="275"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="276"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="289"/>
         <source>Table</source>
         <translation type="unfinished"/>
     </message>
@@ -9968,64 +9725,56 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckDisplayOptionsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="86"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="87"/>
         <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="88"/>
         <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
         <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"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="115"/>
         <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="71"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="60"/>
         <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="72"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="61"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10033,17 +9782,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="168"/>
         <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="208"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="169"/>
         <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="209"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="170"/>
         <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>
@@ -10059,52 +9808,47 @@ 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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <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="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"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
         <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="133"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
         <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="134"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
         <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="135"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
         <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="138"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <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="139"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10205,133 +9949,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="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="37"/>
         <source>Move selected set to the top</source>
         <translation>將選擇的系列移到頂端</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="44"/>
         <source>Move selected set up</source>
         <translation>將選擇的系列上移</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="51"/>
         <source>Move selected set down</source>
         <translation>將選擇的系列下移</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="58"/>
         <source>Move selected set to the bottom</source>
         <translation>將選擇的系列移到底部</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="66"/>
         <source>Search by set name, code, or type</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="71"/>
         <source>Default order</source>
         <translation>默認順序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Restore original art priority order</source>
         <translation>恢復初始優先順序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Enable all sets</source>
         <translation>啓用所有系列</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable all sets</source>
         <translation>禁用所有系列</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable selected set(s)</source>
         <translation>啓用所選系列</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Disable selected set(s)</source>
         <translation>禁用所選系列</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <source>Deck Editor</source>
         <translation>套牌編輯器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="129"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <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="128"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="160"/>
         <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="127"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="130"/>
         <source>Card Art</source>
         <translation>牌張風格</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="135"/>
         <source>How to use custom card art</source>
         <translation>如何使用自定義卡牌圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Hints</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Note</source>
         <translation>注</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="146"/>
         <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="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
         <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="147"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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="148"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="151"/>
         <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="187"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="190"/>
         <source>Manage sets</source>
         <translation>系列管理</translation>
     </message>
@@ -10339,72 +10083,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="61"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="60"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="228"/>
         <source>Ungrouped</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="229"/>
         <source>Group by Type</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="230"/>
         <source>Group by Mana Value</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="231"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="238"/>
         <source>Unsorted</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="239"/>
         <source>Sort by Name</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="240"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="248"/>
         <source>shuffle when closing</source>
         <translation>當關閉界面時洗牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>pile view</source>
         <translation>柱形圖</translation>
     </message>
@@ -10439,7 +10183,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Deck Editor</source>
         <translation>套牌編輯</translation>
     </message>
@@ -10520,7 +10264,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -10672,7 +10416,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="715"/>
         <source>Reset Layout</source>
         <translation>重置佈局</translation>
     </message>
@@ -11093,9 +10837,8 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <source>Toggle Untap</source>
+        <translation>鎖定重置狀態</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
@@ -11114,102 +10857,98 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <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>結附卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Unattach Card</source>
         <translation>取消結附</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Clone Card</source>
         <translation>複製卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Create Token...</source>
         <translation>派出衍生物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create All Related Tokens</source>
         <translation>派出所有相關的衍生物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create Another Token</source>
         <translation>派出另一個衍生物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Set Annotation...</source>
         <translation>設置注釋...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
         <source>Bottom of Library</source>
         <translation>牌庫底</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="624"/>
         <source>Exile</source>
         <translation>放逐區</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
         <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Graveyard</source>
         <translation>墳墓場</translation>
     </message>
     <message>
         <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="559"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>手牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Top of Library</source>
         <translation>牌庫頂</translation>
     </message>
     <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
         <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Battlefield, Face Down</source>
         <translation>戰場，面朝下</translation>
     </message>
@@ -11245,246 +10984,234 @@ Please refrain from engaging in this activity or further actions may be taken ag
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
         <source>Stack</source>
         <translation>堆疊</translation>
     </message>
     <message>
         <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="620"/>
         <source>Graveyard (Multiple)</source>
         <translation>墳場(多個)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Exile (Multiple)</source>
         <translation>放逐區(多個)</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="631"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="634"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Draw Arrow...</source>
         <translation>畫箭頭...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="640"/>
         <source>Remove Local Arrows</source>
         <translation>移除本地箭頭</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
         <source>Leave Game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Roll Dice...</source>
         <translation>擲骰子...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="651"/>
         <source>Shuffle Library</source>
         <translation>洗牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="654"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="657"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="660"/>
         <source>Mulligan</source>
         <translation>再調度起手牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="666"/>
         <source>Mulligan (Hand size - 1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="669"/>
         <source>Draw a Card</source>
         <translation>抓一張牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="672"/>
         <source>Draw Multiple Cards...</source>
         <translation>抓多張牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Undo Draw</source>
         <translation>撤銷抓牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
         <source>Always Reveal Top Card</source>
         <translation>一直展示牌庫頂牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Always Look At Top Card</source>
         <translation>一直檢視牌庫頂牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Sort Hand by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Sort Hand by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
         <source>Reveal Hand to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Reveal Random Card to All Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
         <source>Rotate View Clockwise</source>
         <translation>順時針旋轉視角</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
         <source>Rotate View Counterclockwise</source>
         <translation>逆時針旋轉視角</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
         <source>Unfocus Text Box</source>
         <translation>取消聚焦文本框</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
         <source>Focus Chat</source>
         <translation>聚焦聊天室</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="712"/>
         <source>Clear Chat</source>
         <translation>清除聊天記錄</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="718"/>
         <source>Refresh</source>
         <translation>刷新</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="721"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="724"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="747"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="753"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/doc/doxygen/theme b/doc/doxygen/theme
index d52eafe3e..1f3620084 160000
--- a/doc/doxygen/theme
+++ b/doc/doxygen/theme
@@ -1 +1 @@
-Subproject commit d52eafe3e9303399fda15661f3d7bb8fe3d7eabc
+Subproject commit 1f3620084ff75734ed192101acf40e9dff01d848
diff --git a/docker-compose.yml b/docker-compose.yml
index 6cbac61f0..3d9f9f38f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: ghcr.io/cockatrice/servatrice:latest
+    image: servatrice
     depends_on:
       - mysql
     ports:
diff --git a/docker-compose.yml.windows b/docker-compose.yml.windows
index 3d29b1e5f..6663c90fd 100644
--- a/docker-compose.yml.windows
+++ b/docker-compose.yml.windows
@@ -16,7 +16,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: ghcr.io/cockatrice/servatrice:latest
+    image: servatrice
     depends_on:
       - mysql
     ports:
diff --git a/format.sh b/format.sh
index 83dee9e28..f8c183dfc 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 and shellcheck
+# Uses clang-format cmake-format git diff find shellcheck
 # Never, ever, should this receive a path with a newline in it. Don't bother proofing it for that.
 
 set -o pipefail
@@ -14,7 +14,13 @@ cd "${BASH_SOURCE%/*}/" || exit 2 # could not find path, this could happen with
 
 # defaults
 include=("cockatrice/src" \
-libcockatrice_* \
+"libcockatrice_card" \
+"libcockatrice_deck_list" \
+"libcockatrice_network" \
+"libcockatrice_protocol" \
+"libcockatrice_rng" \
+"libcockatrice_settings" \
+"libcockatrice_utility" \
 "oracle/src" \
 "servatrice/src" \
 "tests")
@@ -103,11 +109,11 @@ OPTIONS:
         Do not check any source files for clang-format.
 
     --print-version
-        Print the lint tool version being used before continuing.
+        Print the version of clang-format 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.
diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.h b/libcockatrice_card/libcockatrice/card/card_info_comparator.h
index b6df8c7a3..b8d9c47e6 100644
--- a/libcockatrice_card/libcockatrice/card/card_info_comparator.h
+++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.h
@@ -1,8 +1,8 @@
 /**
  * @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
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.cpp b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
index 951381aa4..5c4b408b3 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
@@ -1,7 +1,6 @@
 #include "card_database.h"
 
 #include "../relation/card_relation.h"
-#include "card_database_manager.h"
 #include "parser/cockatrice_xml_4.h"
 
 #include <QCryptographicHash>
@@ -61,15 +60,6 @@ void CardDatabase::loadCardDatabases()
     loadStatus = loader->loadCardDatabases();
 }
 
-void CardDatabase::reloadCardDatabasesAndNotify()
-{
-    loadCardDatabases();
-
-    if (loadStatus == Ok) {
-        notifyEnabledSetsChanged();
-    }
-}
-
 bool CardDatabase::saveCustomTokensToFile()
 {
     return loader->saveCustomTokensToFile();
@@ -103,11 +93,9 @@ 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;
     }
 
@@ -125,17 +113,14 @@ void CardDatabase::removeCard(CardInfoPtr card)
         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());
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.h b/libcockatrice_card/libcockatrice/card/database/card_database.h
index 521be8fbc..7f8fc39db 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.h
@@ -30,27 +30,27 @@ class CardDatabase : public QObject
     Q_OBJECT
 
 protected:
-    /** @brief Controller to determine set priority when choosing preferred printings. */
+    /// Controller to determine set priority when choosing preferred printings.
     ICardSetPriorityController *setPriorityController;
 
-    /** @brief Cards indexed by exact name. */
+    /// Cards indexed by exact name
     CardNameMap cards;
 
-    /** @brief Cards indexed by simplified name (normalized). */
+    /// Cards indexed by simplified name (normalized)
     CardNameMap simpleNameCards;
 
-    /** @brief Sets indexed by short name. */
+    /// Sets indexed by short name
     SetNameMap sets;
 
     FormatRulesNameMap formats;
 
-    /** @brief Loader responsible for file discovery and parsing. */
+    /// Loader responsible for file discovery and parsing
     CardDatabaseLoader *loader;
 
-    /** @brief Current load status of the database. */
+    /// Current load status of the database
     LoadStatus loadStatus;
 
-    /** @brief Querier for higher-level card lookups. */
+    /// Querier for higher-level card lookups
     CardDatabaseQuerier *querier;
 
 private:
@@ -64,7 +64,7 @@ private:
      */
     void refreshCachedReverseRelatedCards();
 
-    /** @brief Mutexes for thread safety. */
+    /// Mutexes for thread safety
     QBasicMutex *clearDatabaseMutex = new QBasicMutex(), *addCardMutex = new QBasicMutex(),
                 *removeCardMutex = new QBasicMutex();
 
@@ -130,11 +130,6 @@ public:
     /** @brief Notifies listeners that enabled sets changed. */
     void notifyEnabledSetsChanged();
 
-    ICardSetPriorityController *getPriorityController()
-    {
-        return setPriorityController;
-    }
-
 public slots:
     /**
      * @brief Adds a card to the database.
@@ -152,7 +147,6 @@ public slots:
 
     /** @brief Loads card databases from configured paths. */
     void loadCardDatabases();
-    void reloadCardDatabasesAndNotify();
 
     /** @brief Saves custom tokens to file.
      * @return True if successful.
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
index 76abf87ce..716477a59 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
@@ -125,9 +125,8 @@ QStringList CardDatabaseLoader::collectCustomDatabasePaths() const
                     QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
 
     QStringList paths;
-    while (it.hasNext()) {
+    while (it.hasNext())
         paths << it.next();
-    }
     paths.sort();
     return paths;
 }
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
index c7de66a25..58a744fbb 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
@@ -67,13 +67,13 @@ private:
     /** @brief Private destructor. */
     ~CardDatabaseManager() = default;
 
-    /** @brief Static card preference provider pointer (default: Noop). */
+    /// Static card preference provider pointer (default: Noop)
     static ICardPreferenceProvider *cardPreferenceProvider;
 
-    /** @brief Static path provider pointer (default: Noop). */
+    /// Static path provider pointer (default: Noop)
     static ICardDatabasePathProvider *pathProvider;
 
-    /** @brief Static set priority controller pointer (default: Noop). */
+    /// 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 174943333..26e515a2d 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
@@ -36,9 +36,8 @@ 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;
@@ -51,12 +50,10 @@ 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));
 }
 
@@ -74,9 +71,8 @@ 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;
@@ -123,9 +119,8 @@ 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());
@@ -138,7 +133,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.isEmpty()) {
+    if (otherPrinting == PrintingInfo()) {
         return getCard({cardName});
     }
 
@@ -365,4 +360,4 @@ QMap<QString, int> CardDatabaseQuerier::getAllFormatsWithCount() const
     }
 
     return formatCounts;
-}
+}
\ No newline at end of file
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 96a5ac104..cc0220526 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
@@ -306,9 +306,8 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                         PrintingInfo printingInfo(set);
                         for (QXmlStreamAttribute attr : attrs) {
                             QString attrName = attr.name().toString();
-                            if (attrName == "picURL") {
+                            if (attrName == "picURL")
                                 attrName = "picurl";
-                            }
                             printingInfo.setProperty(attrName, attr.value().toString());
                         }
 
diff --git a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
index 8778ab17e..16f2359ab 100644
--- a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
+++ b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
@@ -51,21 +51,16 @@ enum class CardMatchType
 // convert string to enum
 inline CardMatchType matchTypeFromString(const QString &str)
 {
-    if (str == "equals") {
+    if (str == "equals")
         return CardMatchType::Equals;
-    }
-    if (str == "notEquals") {
+    if (str == "notEquals")
         return CardMatchType::NotEquals;
-    }
-    if (str == "contains") {
+    if (str == "contains")
         return CardMatchType::Contains;
-    }
-    if (str == "notContains") {
+    if (str == "notContains")
         return CardMatchType::NotContains;
-    }
-    if (str == "regex") {
+    if (str == "regex")
         return CardMatchType::Regex;
-    }
     return CardMatchType::Equals; // fallback default
 }
 
diff --git a/libcockatrice_card/libcockatrice/card/game_specific_terms.h b/libcockatrice_card/libcockatrice/card/game_specific_terms.h
index e9160e514..2931365ad 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,36 +31,26 @@ 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/printing/exact_card.h b/libcockatrice_card/libcockatrice/card/printing/exact_card.h
index 74fc75da3..01c61a3a1 100644
--- a/libcockatrice_card/libcockatrice/card/printing/exact_card.h
+++ b/libcockatrice_card/libcockatrice/card/printing/exact_card.h
@@ -114,6 +114,5 @@ public:
      */
     void emitPixmapUpdated() const;
 };
-Q_DECLARE_METATYPE(ExactCard)
 
 #endif // EXACT_CARD_H
diff --git a/libcockatrice_card/libcockatrice/card/printing/printing_info.h b/libcockatrice_card/libcockatrice/card/printing/printing_info.h
index ad7b33654..43d82a9cb 100644
--- a/libcockatrice_card/libcockatrice/card/printing/printing_info.h
+++ b/libcockatrice_card/libcockatrice/card/printing/printing_info.h
@@ -54,16 +54,6 @@ public:
         return this->set == other.set && this->properties == other.properties;
     }
 
-    /**
-     * @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 && properties.isEmpty();
-    }
-
 private:
     CardSetPtr set;          ///< The set this variation belongs to.
     QVariantHash properties; ///< Key-value store for variation-specific attributes.
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.cpp b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
index 6eea220bb..20d0aced8 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set.cpp
+++ b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
@@ -33,9 +33,28 @@ 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;
 }
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.h b/libcockatrice_card/libcockatrice/card/set/card_set.h
index 8e16e01df..fe4b66522 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set.h
+++ b/libcockatrice_card/libcockatrice/card/set/card_set.h
@@ -107,31 +107,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,16 +181,7 @@ public:
      */
     void loadSetOptions();
 
-    void setSortKeyInMemory(unsigned int _sortKey)
-    {
-        sortKey = _sortKey;
-    }
-    void setEnabledInMemory(bool _enabled)
-    {
-        enabled = _enabled;
-    }
-
-    /** @return The sort key assigned to this set. */
+    /// @return The sort key assigned to this set.
     [[nodiscard]] int getSortKey() const
     {
         return sortKey;
@@ -202,7 +193,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;
@@ -214,7 +205,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;
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h b/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h
index 0caa9f156..96f1052a9 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_deck_list/libcockatrice/deck_list/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
index d41713302..e3e7b41c0 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
@@ -143,14 +143,12 @@ bool DeckList::loadFromXml(QXmlStreamReader *xml)
     while (!xml->atEnd()) {
         xml->readNext();
         if (xml->isStartElement()) {
-            if (xml->name().toString() != "cockatrice_deck") {
+            if (xml->name().toString() != "cockatrice_deck")
                 return false;
-            }
             while (!xml->atEnd()) {
                 xml->readNext();
-                if (!readElement(xml)) {
+                if (!readElement(xml))
                     break;
-                }
             }
         }
     }
@@ -293,9 +291,8 @@ bool DeckList::loadFromStream_Plain(QTextStream &in,
     for (; index < max_line; ++index) {
         // check if line is a card
         match = reCardLine.match(inputs.at(index));
-        if (!match.hasMatch()) {
+        if (!match.hasMatch())
             continue;
-        }
 
         QString cardName = match.captured().simplified();
         bool sideboard = false;
@@ -308,9 +305,8 @@ bool DeckList::loadFromStream_Plain(QTextStream &in,
                 cardName = match.captured(1);
             }
         } else {
-            if (index == sBStart) {
+            if (index == sBStart)
                 continue;
-            }
             sideboard = index > sBStart;
         }
 
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
index e792c85dc..a96adeb38 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
@@ -89,7 +89,7 @@ private:
     mutable QString cachedDeckHash;
 
 public:
-    /** @name Metadata setters */
+    /// @name Metadata setters
     ///@{
     void setName(const QString &_name = QString())
     {
@@ -125,11 +125,11 @@ public:
     }
     ///@}
 
-    /** @brief Construct an empty deck. */
+    /// @brief Construct an empty deck.
     explicit DeckList();
-    /** @brief Construct from a serialized native-format string. */
+    /// @brief Construct from a serialized native-format string.
     explicit DeckList(const QString &nativeString);
-    /** @brief Construct from components. */
+    /// @brief Construct from components
     DeckList(const Metadata &metadata,
              const DecklistNodeTree &tree,
              const QMap<QString, SideboardPlan> &sideboardPlans = {});
@@ -144,10 +144,8 @@ public:
         return &tree;
     }
 
-    /**
-     * @name Metadata getters
-     * The individual metadata getters still exist for backwards compatibility.
-     */
+    /// @name Metadata getters
+    /// The individual metadata getters still exist for backwards compatibility.
     ///@{
     //! \todo Figure out when we can remove them.
     const Metadata &getMetadata() const
@@ -185,7 +183,7 @@ public:
         return metadata.isEmpty() && getCardList().isEmpty();
     }
 
-    /** @name Sideboard plans */
+    /// @name Sideboard plans
     ///@{
     QList<MoveCard_ToZone> getCurrentSideboardPlan() const;
     void setCurrentSideboardPlan(const QList<MoveCard_ToZone> &plan);
@@ -195,7 +193,7 @@ public:
     }
     ///@}
 
-    /** @name Serialization (XML) */
+    /// @name Serialization (XML)
     ///@{
     bool readElement(QXmlStreamReader *xml);
     void write(QXmlStreamWriter *xml) const;
@@ -206,7 +204,7 @@ public:
     bool saveToFile_Native(QIODevice *device) const;
     ///@}
 
-    /** @name Serialization (Plain text) */
+    /// @name Serialization (Plain text)
     ///@{
     bool loadFromStream_Plain(QTextStream &stream,
                               bool preserveMetadata,
@@ -218,7 +216,7 @@ public:
     QString writeToString_Plain(bool prefixSideboardCards = true, bool slashTappedOutSplitCards = false) const;
     ///@}
 
-    /** @name Deck manipulation */
+    /// @name Deck manipulation
     ///@{
     void cleanList(bool preserveMetadata = false);
     bool isEmpty() const
@@ -240,7 +238,7 @@ public:
                               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 acf4707ab..83c9cc0bb 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
@@ -16,9 +16,8 @@ void DeckListHistoryManager::clear()
 
 void DeckListHistoryManager::undo(DeckList *deck)
 {
-    if (undoStack.isEmpty()) {
+    if (undoStack.isEmpty())
         return;
-    }
 
     // Peek at the memento we are going to restore
     const DeckListMemento &mementoToRestore = undoStack.top();
@@ -36,9 +35,8 @@ void DeckListHistoryManager::undo(DeckList *deck)
 
 void DeckListHistoryManager::redo(DeckList *deck)
 {
-    if (redoStack.isEmpty()) {
+    if (redoStack.isEmpty())
         return;
-    }
 
     // Peek at the memento we are going to restore
     const DeckListMemento &mementoToRestore = redoStack.top();
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
index 196416cde..644e0851a 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
@@ -58,9 +58,8 @@ QList<const InnerDecklistNode *> DecklistNodeTree::getZoneNodes(const QSet<QStri
     QList<const InnerDecklistNode *> zones;
     for (auto *node : *root) {
         InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(node);
-        if (!currentZone) {
+        if (!currentZone)
             continue;
-        }
         if (!restrictToZones.isEmpty() && !restrictToZones.contains(currentZone->getName())) {
             continue;
         }
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
index 8ef0b18a5..6de760634 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
@@ -12,11 +12,11 @@ class DecklistNodeTree
     InnerDecklistNode *root; ///< Root of the deck tree (zones + cards).
 
 public:
-    /** @brief Constructs an empty DecklistNodeTree. */
+    /// @brief Constructs an empty DecklistNodeTree
     explicit DecklistNodeTree();
-    /** @brief Copy constructor. Deep copies the tree. */
+    /// @brief Copy constructor. Deep copies the tree
     explicit DecklistNodeTree(const DecklistNodeTree &other);
-    /** @brief Copy-assignment operator. Deep copies the tree. */
+    /// @brief Copy-assignment operator. Deep copies the tree
     DecklistNodeTree &operator=(const DecklistNodeTree &other);
 
     virtual ~DecklistNodeTree();
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
index a76fed619..d991ec98e 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
@@ -18,30 +18,28 @@ bool SideboardPlan::readElement(QXmlStreamReader *xml)
         xml->readNext();
         const QString childName = xml->name().toString();
         if (xml->isStartElement()) {
-            if (childName == "name") {
+            if (childName == "name")
                 name = xml->readElementText();
-            } else if (childName == "move_card_to_zone") {
+            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") {
+                        if (childName2 == "card_name")
                             m.set_card_name(xml->readElementText().toStdString());
-                        } else if (childName2 == "start_zone") {
+                        else if (childName2 == "start_zone")
                             m.set_start_zone(xml->readElementText().toStdString());
-                        } else if (childName2 == "target_zone") {
+                        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")) {
+        } else if (xml->isEndElement() && (childName == "sideboard_plan"))
             return true;
-        }
     }
     return false;
 }
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
index fff4ff2f3..524217c2d 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
@@ -51,19 +51,19 @@ public:
      */
     void write(QXmlStreamWriter *xml) const;
 
-    /** @return The plan name. */
+    /// @return The plan name.
     [[nodiscard]] QString getName() const
     {
         return name;
     }
 
-    /** @return Const reference to the move list. */
+    /// @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. */
+    /// @brief Replace the move list with a new one.
     void setMoveList(const QList<MoveCard_ToZone> &_moveList);
 };
 
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 705dfae4c..b8a497c20 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
@@ -38,9 +38,8 @@ bool AbstractDecklistCardNode::readElement(QXmlStreamReader *xml)
 {
     while (!xml->atEnd()) {
         xml->readNext();
-        if (xml->isEndElement() && xml->name().toString() == "card") {
+        if (xml->isEndElement() && xml->name().toString() == "card")
             return false;
-        }
     }
     return true;
 }
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 df903a168..88d8b0930 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
@@ -58,40 +58,40 @@ 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. */
+    /// @return The format legality of the card
     virtual bool getFormatLegality() const = 0;
 
-    /** @param _formatLegal If the card is considered legal. */
+    /// @param _formatLegal If the card is considered legal
     virtual void setFormatLegality(const bool _formatLegal) = 0;
 
     /**
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 a39f0e7b2..877705705 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
@@ -101,7 +101,7 @@ public:
      */
     explicit AbstractDecklistNode(InnerDecklistNode *_parent = nullptr, int position = -1);
 
-    /** @brief Virtual destructor. Child classes must clean up their resources. */
+    /// Virtual destructor. Child classes must clean up their resources.
     virtual ~AbstractDecklistNode() = default;
 
     /**
@@ -136,7 +136,7 @@ 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;
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 3bab5405a..b3d42b89a 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
@@ -93,79 +93,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 The format legality of the card. */
+    /// @return The format legality of the card
     [[nodiscard]] bool getFormatLegality() const override
     {
         return formatLegal;
     }
 
-    /** @param _formatLegal If the card is considered legal. */
+    /// @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. */
+    /// @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 602ea6aec..eca58963a 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
@@ -48,9 +48,8 @@ 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();
 }
 
@@ -155,9 +154,8 @@ bool InnerDecklistNode::readElement(QXmlStreamReader *xml)
                     xml->attributes().value("collectorNumber").toString(), xml->attributes().value("uuid").toString());
                 newCard->readElement(xml);
             }
-        } else if (xml->isEndElement() && (childName == "zone")) {
+        } else if (xml->isEndElement() && (childName == "zone"))
             return false;
-        }
     }
     return true;
 }
@@ -166,9 +164,8 @@ 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
 }
 
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 81c37dffa..f4c48afce 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,11 +18,11 @@
 
 #include "abstract_deck_list_node.h"
 
-/** @brief Constant for the "main" deck zone name. */
+/// Constant for the "main" deck zone name.
 #define DECK_ZONE_MAIN "main"
-/** @brief Constant for the "sideboard" zone name. */
+/// Constant for the "sideboard" zone name.
 #define DECK_ZONE_SIDE "side"
-/** @brief Constant for the "tokens" zone name. */
+/// Constant for the "tokens" zone name.
 #define DECK_ZONE_TOKENS "tokens"
 
 /**
@@ -93,13 +93,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;
@@ -122,25 +122,25 @@ public:
      */
     [[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 +196,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;
 
     /**
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.h b/libcockatrice_filters/libcockatrice/filters/filter_card.h
index bb1e0ef53..732e43a09 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_card.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_card.h
@@ -1,8 +1,8 @@
 /**
  * @file filter_card.h
  * @ingroup CardDatabaseModelFilters
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef CARDFILTER_H
 #define CARDFILTER_H
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
index 25e8e97db..704e8fadb 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
@@ -251,27 +251,20 @@ 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; };
     };
 
@@ -322,9 +315,8 @@ 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);
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.h b/libcockatrice_filters/libcockatrice/filters/filter_string.h
index 71a99f7b5..8fc41ce68 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_string.h
@@ -1,8 +1,8 @@
 /**
  * @file filter_string.h
  * @ingroup CardDatabaseModelFilters
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef FILTER_STRING_H
 #define FILTER_STRING_H
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
index 8502db50b..19e8c2d8d 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
@@ -205,9 +205,8 @@ 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();
@@ -543,14 +542,12 @@ 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 aac1777e0..75d4241a5 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.h
@@ -1,8 +1,8 @@
 /**
  * @file filter_tree.h
  * @ingroup CardDatabaseModelFilters
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef FILTERTREE_H
 #define FILTERTREE_H
@@ -70,33 +70,28 @@ 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);
-        }
     }
 };
 
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 9559967af..46a5897f7 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h
@@ -6,24 +6,15 @@
 class ICardSetPriorityController
 {
 public:
-    struct SetSaveData
-    {
-        QString shortName;
-        unsigned int sortKey;
-        bool enabled;
-    };
-
     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) const = 0;
-    virtual bool isEnabled(QString shortName) const = 0;
-    virtual bool isKnown(QString shortName) const = 0;
-
-    virtual void saveSets(const QVector<SetSaveData> &data) = 0;
+    virtual unsigned int getSortKey(QString shortName) = 0;
+    virtual bool isEnabled(QString shortName) = 0;
+    virtual bool isKnown(QString shortName) = 0;
 };
 
 #endif // COCKATRICE_INTERFACE_CARD_SET_PRIORITY_CONTROLLER_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 188e2ced9..949ab5a91 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h
@@ -16,22 +16,18 @@ public:
     {
     }
 
-    unsigned int getSortKey(QString /* shortName */) const override
+    unsigned int getSortKey(QString /* shortName */) override
     {
         return 0;
     }
-    bool isEnabled(QString /* shortName */) const override
+    bool isEnabled(QString /* shortName */) override
     {
         return true;
     }
-    bool isKnown(QString /* shortName */) const override
+    bool isKnown(QString /* shortName */) override
     {
         return true;
     }
-
-    void saveSets(const QVector<SetSaveData> & /* data */) override
-    {
-    }
 };
 
 #endif // COCKATRICE_NOOP_CARD_SET_PRIORITY_CONTROLLER_H
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 91dc06335..afb6f1fcf 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,8 +1,8 @@
 /**
  * @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
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 d1fbbac2f..6a930c1da 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
@@ -19,9 +19,8 @@ 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();
-    }
 
     if (role == Qt::DisplayRole) {
         return searchResults.at(index.row()).card->getName();
@@ -35,9 +34,8 @@ void CardSearchModel::updateSearchResults(const QString &query)
     beginResetModel();
     searchResults.clear();
 
-    if (query.isEmpty() || !sourceModel) {
+    if (query.isEmpty() || !sourceModel)
         return;
-    }
 
     // Set the filter for the display model
     sourceModel->setCardName(query);
@@ -48,15 +46,13 @@ void CardSearchModel::updateSearchResults(const QString &query)
         QModelIndex sourceIndex = sourceModel->mapToSource(modelIndex);
         CardDatabaseModel *sourceDbModel = qobject_cast<CardDatabaseModel *>(sourceModel->sourceModel());
 
-        if (!sourceDbModel || !sourceIndex.isValid()) {
+        if (!sourceDbModel || !sourceIndex.isValid())
             return;
-        }
 
         CardInfoPtr card = sourceDbModel->getCard(sourceIndex.row());
 
-        if (!card) {
+        if (!card)
             continue;
-        }
 
         int distance = levenshteinDistance(query.toLower(), card->getName().toLower());
         searchResults.append({card, distance});
@@ -67,9 +63,8 @@ void CardSearchModel::updateSearchResults(const QString &query)
               [](const SearchResult &a, const SearchResult &b) { return a.distance < b.distance; });
 
     // Keep only the top 5 results
-    if (searchResults.size() > 10) {
+    if (searchResults.size() > 10)
         searchResults = searchResults.mid(0, 10);
-    }
 
     emit dataChanged(index(0, 0), index(rowCount() - 1, 0));
     emit layoutChanged();
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 bc4be7a0e..18be2c55a 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
@@ -1,8 +1,8 @@
 /**
  * @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
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 724ee61f2..5ce63a939 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
@@ -10,28 +10,11 @@ CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
     setSortCaseSensitivity(Qt::CaseInsensitive);
 
     dirtyTimer.setSingleShot(true);
-    connect(&dirtyTimer, &QTimer::timeout, this, [this]() {
-        invalidate();
-        emit modelDirty();
-    });
+    connect(&dirtyTimer, &QTimer::timeout, this, &CardDatabaseDisplayModel::invalidate);
 
     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'\''},
@@ -75,14 +58,12 @@ 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("/");
@@ -174,9 +155,8 @@ 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)) {
@@ -190,17 +170,14 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex
 
 bool CardDatabaseDisplayModel::rowMatchesCardName(CardInfoPtr info) const
 {
-    if (!cardName.isEmpty() && !info->getName().contains(cardName, Qt::CaseInsensitive)) {
+    if (!cardName.isEmpty() && !info->getName().contains(cardName, Qt::CaseInsensitive))
         return false;
-    }
 
-    if (!cardNameSet.isEmpty() && !cardNameSet.contains(info->getName())) {
+    if (!cardNameSet.isEmpty() && !cardNameSet.contains(info->getName()))
         return false;
-    }
 
-    if (filterTree != nullptr) {
+    if (filterTree != nullptr)
         return filterTree->acceptsCard(info);
-    }
 
     return true;
 }
@@ -214,9 +191,8 @@ 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
@@ -226,9 +202,8 @@ 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);
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 c3145c356..0c5994a3a 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
@@ -38,11 +38,11 @@ private:
 
 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,17 +53,20 @@ 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 setCardNameSet(const QSet<QString> &_cardNameSet)
     {
         cardNameSet = _cardNameSet;
+        emit modelDirty();
         dirty();
     }
 
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
index 253dcd134..e33156329 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
@@ -31,9 +31,8 @@ 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()) {
@@ -57,12 +56,10 @@ 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"));
@@ -81,27 +78,24 @@ QVariant CardDatabaseModel::headerData(int section, Qt::Orientation orientation,
     }
 }
 
-void CardDatabaseModel::cardInfoChanged(const CardInfoPtr &card)
+void CardDatabaseModel::cardInfoChanged(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(const CardInfoPtr &card) const
+bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card)
 {
-    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;
-            }
         }
     }
 
@@ -125,7 +119,7 @@ void CardDatabaseModel::cardDatabaseEnabledSetsChanged()
     }
 }
 
-void CardDatabaseModel::cardAdded(const CardInfoPtr &card)
+void CardDatabaseModel::cardAdded(CardInfoPtr card)
 {
     if (checkCardHasAtLeastOneEnabledSet(card)) {
         // add the card if it's present in at least one enabled set
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_model.h
index 8655389d7..218cfff92 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.h
@@ -51,11 +51,11 @@ private:
     CardDatabase *db;
     bool showOnlyCardsFromEnabledSets;
 
-    inline bool checkCardHasAtLeastOneEnabledSet(const CardInfoPtr &card) const;
+    inline bool checkCardHasAtLeastOneEnabledSet(CardInfoPtr card);
 private slots:
-    void cardAdded(const CardInfoPtr &card);
+    void cardAdded(CardInfoPtr card);
     void cardRemoved(CardInfoPtr card);
-    void cardInfoChanged(const CardInfoPtr &card);
+    void cardInfoChanged(CardInfoPtr card);
     void cardDatabaseEnabledSetsChanged();
 };
 
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 5e0cc31d8..f6dc4f9cf 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
@@ -6,9 +6,8 @@ SetsModel::SetsModel(CardDatabase *_db, QObject *parent) : QAbstractTableModel(p
 {
     sets.sortByKey();
     for (const CardSetPtr &set : sets) {
-        if (set->getEnabled()) {
+        if (set->getEnabled())
             enabledSets.insert(set);
-        }
     }
 }
 
@@ -16,18 +15,16 @@ 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()];
 
@@ -43,9 +40,8 @@ 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:
@@ -76,9 +72,8 @@ 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 */
@@ -102,15 +97,13 @@ 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;
 }
@@ -122,9 +115,8 @@ 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);
@@ -136,19 +128,16 @@ 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);
 
@@ -159,11 +148,10 @@ 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));
 }
@@ -172,15 +160,13 @@ 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));
 }
@@ -189,11 +175,9 @@ 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));
 }
@@ -224,9 +208,8 @@ 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();
@@ -245,19 +228,16 @@ void SetsModel::sort(int column, Qt::SortOrder order)
 
 void SetsModel::save(CardDatabase *db)
 {
-    QVector<ICardSetPriorityController::SetSaveData> saveData;
-    saveData.reserve(sets.size());
+    // order
+    for (int i = 0; i < sets.size(); i++)
+        sets[i]->setSortKey(static_cast<unsigned int>(i + 1));
 
-    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});
-    }
+    // enabled sets
+    for (const CardSetPtr &set : sets)
+        set->setEnabled(enabledSets.contains(set));
 
-    db->getPriorityController()->saveSets(saveData);
     sets.sortByKey();
+
     db->notifyEnabledSetsChanged();
 }
 
@@ -270,9 +250,8 @@ 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));
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 2adf71def..0ffc5a847 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,8 +1,8 @@
 /**
  * @file sets_model.h
  * @ingroup CardDatabaseModels
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef SETSMODEL_H
 #define SETSMODEL_H
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 c8f767189..f6b2fdfbb 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
@@ -1,8 +1,8 @@
 /**
  * @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
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 92dfaadd7..5e5843761 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
@@ -1,8 +1,8 @@
 /**
  * @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
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 9b43281c1..e43c612f0 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
@@ -66,7 +66,7 @@ void DeckListModel::rebuildTree()
         for (int j = 0; j < currentZone->size(); j++) {
             auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
 
-            //! \todo Better sanity checking.
+            // TODO: better sanity checking
             if (currentCard == nullptr) {
                 continue;
             }
@@ -257,9 +257,8 @@ Qt::ItemFlags DeckListModel::flags(const QModelIndex &index) const
 void DeckListModel::emitBackgroundUpdates(const QModelIndex &parent)
 {
     int rows = rowCount(parent);
-    if (rows == 0) {
+    if (rows == 0)
         return;
-    }
 
     QModelIndex topLeft = index(0, 0, parent);
     QModelIndex bottomRight = index(rows - 1, columnCount() - 1, parent);
@@ -540,9 +539,8 @@ int DeckListModel::findSortedInsertRow(const InnerDecklistNode *parent, const 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) {
@@ -559,9 +557,8 @@ int DeckListModel::findSortedInsertRow(const InnerDecklistNode *parent, const Ca
                 break;
         }
 
-        if (lessThan) {
+        if (lessThan)
             return i;
-        }
     }
 
     return parent->size(); // insert at end if no earlier match
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 209ec8c42..86d36b7f9 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
@@ -89,15 +89,12 @@ 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
@@ -430,9 +427,8 @@ private:
 
     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()));
     }
 
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 3d433153a..0ec159737 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
@@ -29,29 +29,25 @@ 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 1565417f0..94742795d 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,8 +1,8 @@
 /**
  * @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
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
index 916f4351b..11458768d 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
@@ -66,9 +66,8 @@ 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);
 
             pend->processResponse(response);
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
index 2eb7e3356..dc3be5a94 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
@@ -1,8 +1,8 @@
 /**
  * @file abstract_client.h
  * @ingroup Client
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef ABSTRACTCLIENT_H
 #define ABSTRACTCLIENT_H
diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.h b/libcockatrice_network/libcockatrice/network/client/local/local_client.h
index 9e1c89ddd..e8c5330ac 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
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
index 7e20f2722..4b5d3f1b8 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
@@ -213,9 +213,8 @@ 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;
@@ -224,14 +223,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()) {
@@ -285,9 +284,8 @@ 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) {
@@ -295,15 +293,13 @@ 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,9 +311,8 @@ 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);
@@ -388,31 +383,24 @@ void RemoteClient::readData()
                     inputBuffer.remove(0, 4);
                     messageInProgress = true;
                 }
-            } else {
+            } else
                 return;
-            }
         }
-        if (inputBuffer.size() < messageLength) {
+        if (inputBuffer.size() < messageLength)
             return;
-        }
 
         ServerMessage newServerMessage;
-        bool ok = newServerMessage.ParseFromArray(inputBuffer.data(), messageLength);
+        newServerMessage.ParseFromArray(inputBuffer.data(), messageLength);
+
+        qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
 
         inputBuffer.remove(0, messageLength);
         messageInProgress = false;
 
-        if (ok) {
-            qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
+        processProtocolItem(newServerMessage);
 
-            processProtocolItem(newServerMessage);
-        } else {
-            qCDebug(RemoteClientLog) << "parsing error!";
-        }
-
-        if (getStatus() == StatusDisconnecting) { // use thread-safe getter
+        if (getStatus() == StatusDisconnecting) // use thread-safe getter
             doDisconnectFromServer();
-        }
     } while (!inputBuffer.isEmpty());
 }
 
@@ -420,13 +408,11 @@ void RemoteClient::websocketMessageReceived(const QByteArray &message)
 {
     lastDataReceived = timeRunning;
     ServerMessage newServerMessage;
-    if (newServerMessage.ParseFromArray(message.data(), message.length())) {
-        qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
+    newServerMessage.ParseFromArray(message.data(), message.length());
 
-        processProtocolItem(newServerMessage);
-    } else {
-        qCDebug(RemoteClientLog) << "parsing error!";
-    }
+    qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
+
+    processProtocolItem(newServerMessage);
 }
 
 void RemoteClient::sendCommandContainer(const CommandContainer &cont)
@@ -440,27 +426,19 @@ void RemoteClient::sendCommandContainer(const CommandContainer &cont)
     qCDebug(RemoteClientLog).noquote() << "OUT" << getSafeDebugString(cont);
 
     QByteArray buf;
-    bool ok;
     if (usingWebSocket) {
         buf.resize(size);
-        ok = cont.SerializeToArray(buf.data(), size);
-        if (ok) {
-            websocket->sendBinaryMessage(buf);
-        }
+        cont.SerializeToArray(buf.data(), size);
+        websocket->sendBinaryMessage(buf);
     } else {
         buf.resize(size + 4);
-        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);
+        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);
 
-            socket->write(buf);
-        }
-    }
-    if (!ok) {
-        qCDebug(RemoteClientLog) << "transmit error!";
+        socket->write(buf);
     }
 }
 
@@ -545,9 +523,8 @@ void RemoteClient::doDisconnectFromServer()
     pendingCommands.clear();
 
     setStatus(StatusDisconnected);
-    if (websocket->isValid()) {
+    if (websocket->isValid())
         websocket->close();
-    }
     socket->close();
 }
 
@@ -624,9 +601,8 @@ 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;
@@ -638,9 +614,8 @@ 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);
@@ -678,12 +653,10 @@ 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();
 }
@@ -711,9 +684,8 @@ void RemoteClient::submitForgotPasswordResetResponse(const Response &response)
 {
     if (response.response_code() == Response::RespOk) {
         emit sigForgotPasswordSuccess();
-    } else {
+    } else
         emit sigForgotPasswordError();
-    }
 
     doDisconnectFromServer();
 }
@@ -746,9 +718,8 @@ 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 289fdc5d0..15e3e8ef5 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
@@ -1,8 +1,8 @@
 /**
  * @file remote_client.h
  * @ingroup Client
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef REMOTECLIENT_H
 #define REMOTECLIENT_H
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server.h b/libcockatrice_network/libcockatrice/network/server/local/local_server.h
index 0112afa72..70586f6c1 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server.h
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server.h
@@ -1,8 +1,8 @@
 /**
  * @file local_server.h
  * @ingroup Server
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef LOCALSERVER_H
 #define LOCALSERVER_H
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 44e3b3e53..4410fd65c 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
@@ -1,8 +1,8 @@
 /**
  * @file local_server_interface.h
  * @ingroup Server
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef LOCALSERVERINTERFACE_H
 #define LOCALSERVERINTERFACE_H
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 157fa6441..f04bcc849 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
@@ -49,8 +49,6 @@
 #include <libcockatrice/rng/rng_abstract.h>
 #include <libcockatrice/utility/trice_limits.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <limits>
-#include <ranges>
 
 Server_AbstractPlayer::Server_AbstractPlayer(Server_Game *_game,
                                              int _playerId,
@@ -81,6 +79,17 @@ 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;
@@ -219,37 +228,6 @@ shouldBeFaceDown(const MoveCardStruct &cardStruct, const Server_CardZone *startZ
     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,
@@ -266,11 +244,8 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
         return Response::RespContextError;
     }
 
-    if (!targetzone->hasCoords()) {
-        yCoord = 0;
-        if (xCoord <= -1) {
-            xCoord = targetzone->getCards().size();
-        }
+    if (!targetzone->hasCoords() && (xCoord <= -1)) {
+        xCoord = targetzone->getCards().size();
     }
 
     std::set<MoveCardStruct> cardsToMove;
@@ -310,21 +285,164 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
     bool revealTopStart = false;
     bool revealTopTarget = false;
 
-    bool isFromBottom = shouldBeFromTheBottom(startzone, cardsToMove);
+    for (auto cardStruct : cardsToMove) {
+        Server_Card *card = cardStruct.card;
+        int originalPosition = cardStruct.position;
 
-    if (isFromBottom) {
-        std::ranges::reverse_view reversedCardsToMove{cardsToMove};
-        for (auto card : reversedCardsToMove) {
-            processMoveCard(ges, startzone, targetzone, card, xCoord, yCoord, xIndex, revealTopStart, revealTopTarget,
-                            isReversed, undoingDraw);
+        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);
+            }
         }
-    } else {
-        for (auto card : cardsToMove) {
-            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;
+
+            bool faceDown = shouldBeFaceDown(cardStruct, startzone, targetzone);
+
+            if (targetzone->hasCoords()) {
+                newX = targetzone->getFreeGridColumn(newX, yCoord, card->getName(), faceDown);
+            } else {
+                yCoord = 0;
+                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);
         }
     }
-
     if (revealTopStart) {
         revealTopCardIfNeeded(startzone, ges);
     }
@@ -344,178 +462,6 @@ 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,
@@ -1084,9 +1030,8 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo
                 _event.set_zone_name(card->getZone()->getName().toStdString());
                 _event.set_card_id(card->getId());
 
-                if (card->setCounter(i.key(), i.value(), &_event)) {
-                    ges.enqueueGameEvent(_event, playerId);
-                }
+                card->setCounter(i.key(), i.value(), &_event);
+                ges.enqueueGameEvent(_event, playerId);
             }
 
             // Copy parent card
@@ -1124,18 +1069,12 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo
                         targetItem = card;
                     }
                     if (sendGameEvent) {
-                        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);
+                        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);
                         arrowInfo->set_start_player_id(player->getPlayerId());
                         arrowInfo->set_start_zone(startCard->getZone()->getName().toStdString());
                         arrowInfo->set_start_card_id(startCard->getId());
@@ -1149,7 +1088,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(createEvent, player->getPlayerId());
+                        ges.enqueueGameEvent(_event, player->getPlayerId());
                     }
                 }
                 for (int id : changedArrowIds) {
@@ -1256,8 +1195,7 @@ 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(game->generateArrowId(), startCard, targetItem, cmd.arrow_color(), currentPhase,
-                                  deletionPhase);
+    auto arrow = new Server_Arrow(newArrowId(), startCard, targetItem, cmd.arrow_color(), currentPhase, deletionPhase);
     addArrow(arrow);
 
     Event_CreateArrow event;
@@ -1339,9 +1277,8 @@ Response::ResponseCode Server_AbstractPlayer::cmdSetCardCounter(const Command_Se
     Event_SetCardCounter event;
     event.set_zone_name(zone->getName().toStdString());
     event.set_card_id(card->getId());
-    if (card->setCounter(cmd.counter_id(), cmd.counter_value(), &event)) {
-        ges.enqueueGameEvent(event, playerId);
-    }
+    card->setCounter(cmd.counter_id(), cmd.counter_value(), &event);
+    ges.enqueueGameEvent(event, playerId);
 
     return Response::RespOk;
 }
@@ -1370,13 +1307,14 @@ 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());
-    if (!card->incrementCounter(cmd.counter_id(), cmd.counter_delta(), &event)) {
-        return Response::RespOk;
-    }
-
+    event.set_counter_id(cmd.counter_id());
+    event.set_counter_value(newValue);
     ges.enqueueGameEvent(event, playerId);
 
     return Response::RespOk;
@@ -1474,9 +1412,8 @@ 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) {
@@ -1565,7 +1502,7 @@ Server_AbstractPlayer::cmdRevealCards(const Command_RevealCards &cmd, ResponseCo
             zone->addWritePermission(cmd.player_id());
         }
 
-        if (judge) {
+        if (isJudge()) {
             ges.setOverwriteOwnership(true);
         }
 
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 85fbc0557..40fe84aa1 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
@@ -74,6 +74,7 @@ public:
     }
 
     int newCardId();
+    int newArrowId() const;
 
     void addZone(Server_CardZone *zone);
     void addArrow(Server_Arrow *arrow);
@@ -92,19 +93,6 @@ 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 2ad38b977..f6787baa2 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
@@ -30,7 +30,6 @@ 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_card.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
index b858314c0..86ff2f008 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
@@ -26,8 +26,6 @@
 #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/trice_limits.h>
-#include <limits>
 
 Server_Card::Server_Card(const CardRef &cardRef, int _id, int _coord_x, int _coord_y, Server_CardZone *_zone)
     : zone(_zone), id(_id), coord_x(_coord_x), coord_y(_coord_y), cardRef(cardRef), tapped(false), attacking(false),
@@ -38,13 +36,11 @@ 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();
@@ -66,18 +62,16 @@ 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: {
@@ -95,9 +89,8 @@ 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);
@@ -106,71 +99,31 @@ 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;
 }
 
-bool Server_Card::setCounter(int _id, int value, Event_SetCardCounter *event)
+void Server_Card::setCounter(int _id, int value, Event_SetCardCounter *event)
 {
-    // Clamp to valid card counter range [0, MAX_COUNTERS_ON_CARD]
-    value = qBound(0, value, MAX_COUNTERS_ON_CARD);
-
-    const int oldValue = counters.value(_id, 0);
-    if (value == oldValue) {
-        return false;
-    }
-
-    if (value) {
+    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);
-    const auto result = static_cast<int64_t>(oldValue) + static_cast<int64_t>(delta);
-    // Clamp to [0, MAX_COUNTERS_ON_CARD] for card counters
-    const int newValue =
-        static_cast<int>(qBound(static_cast<int64_t>(0), result, static_cast<int64_t>(MAX_COUNTERS_ON_CARD)));
-
-    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 3d7e649b9..bc326bbc4 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
@@ -153,24 +153,7 @@ public:
     {
         cardRef = _cardRef;
     }
-    /**
-     * @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_COUNTERS_ON_CARD]; 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_COUNTERS_ON_CARD].
-     */
-    [[nodiscard]] bool incrementCounter(int counterId, int delta, Event_SetCardCounter *event = nullptr);
+    void setCounter(int _id, int value, 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 1db4f9c4c..f2a35e548 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
@@ -47,23 +47,19 @@ 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);
@@ -74,47 +70,40 @@ void Server_CardZone::shuffle(int start, int end)
 
 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 {
@@ -157,9 +146,8 @@ 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);
@@ -169,13 +157,11 @@ 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);
@@ -198,35 +184,32 @@ 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;
     }
@@ -236,18 +219,16 @@ 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);
 }
@@ -262,14 +243,12 @@ 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()) {
@@ -278,30 +257,26 @@ 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());
 }
 
@@ -324,9 +299,8 @@ 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();
@@ -355,8 +329,7 @@ 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_counter.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
index e65205cbb..b18e11c2b 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
@@ -1,24 +1,12 @@
 #include "server_counter.h"
 
 #include <libcockatrice/protocol/pb/serverinfo_counter.pb.h>
-#include <limits>
 
 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)
 {
 }
 
-//! \todo Extract overflow-safe arithmetic into shared helper.
-//! Duplicated in Server_Card::incrementCounter() - keep in sync if modified.
-bool Server_Counter::incrementCount(int delta)
-{
-    const int oldCount = count;
-    const auto result = static_cast<int64_t>(count) + static_cast<int64_t>(delta);
-    count = static_cast<int>(qBound(static_cast<int64_t>(std::numeric_limits<int>::min()), result,
-                                    static_cast<int64_t>(std::numeric_limits<int>::max())));
-    return count != oldCount;
-}
-
 void Server_Counter::getInfo(ServerInfo_Counter *info)
 {
     info->set_id(id);
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 8226e663f..55aad991c 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h
@@ -25,18 +25,6 @@
 
 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:
@@ -71,33 +59,11 @@ public:
     {
         return 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)
+    void 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);
-
-    /**
-     * @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_game.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
index 4761199e5..2224ddb13 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
@@ -147,9 +147,8 @@ 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,9 +166,8 @@ 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;
@@ -191,9 +189,8 @@ void Server_Game::pingClockTimeout()
     bool allPlayersInactive = true;
     int playerCount = 0;
     for (auto *participant : participants) {
-        if (participant == nullptr) {
+        if (participant == nullptr)
             continue;
-        }
 
         if (!participant->isSpectator()) {
             ++playerCount;
@@ -256,9 +253,8 @@ int Server_Game::getSpectatorCount() const
 
     int result = 0;
     for (Server_AbstractParticipant *participant : participants.values()) {
-        if (participant->isSpectator()) {
+        if (participant->isSpectator())
             ++result;
-        }
     }
     return result;
 }
@@ -273,9 +269,8 @@ 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);
@@ -311,7 +306,7 @@ void Server_Game::sendGameStateToPlayers()
             }
         } else {
             Event_GameStateChanged event;
-            createGameStateChangedEvent(&event, participant, participant->isJudge(), false);
+            createGameStateChangedEvent(&event, participant, false, false);
 
             gec = prepareGameEvent(event, -1);
         }
@@ -334,7 +329,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;
@@ -372,9 +367,8 @@ void Server_Game::doStartGameIfReady(bool forceStartGame)
         delete replayCont;
 
         startTimeOfThisGame = secondsElapsed;
-    } else {
+    } else
         firstGameStarted = true;
-    }
 
     sendGameStateToPlayers();
 
@@ -402,13 +396,11 @@ void Server_Game::stopGameIfFinished()
     int playing = 0;
     auto players = getPlayers();
     for (auto *player : players.values()) {
-        if (!player->getConceded()) {
+        if (!player->getConceded())
             ++playing;
-        }
     }
-    if (playing > 1) {
+    if (playing > 1)
         return;
-    }
 
     gameStarted = false;
 
@@ -436,40 +428,32 @@ 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 ((_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;
 }
@@ -479,9 +463,8 @@ 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;
 }
@@ -517,7 +500,7 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface,
         allPlayersEver.insert(playerName);
 
         // if the original creator of the game joins, give them host status back
-        //! \todo 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));
@@ -533,9 +516,8 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface,
         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());
 
@@ -582,9 +564,8 @@ void Server_Game::removeParticipant(Server_AbstractParticipant *participant, Eve
     }
     if (!spectator) {
         stopGameIfFinished();
-        if (gameStarted && playerActive) {
+        if (gameStarted && playerActive)
             nextTurn();
-        }
     }
 
     ServerInfo_Game gameInfo;
@@ -607,18 +588,15 @@ 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;
@@ -657,9 +635,8 @@ 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);
@@ -697,11 +674,6 @@ 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);
@@ -778,7 +750,7 @@ void Server_Game::createGameJoinedEvent(Server_AbstractParticipant *joiningParti
     event2.set_active_player_id(activePlayer);
     event2.set_active_phase(activePhase);
 
-    bool omniscient = (joiningParticipant->isSpectator() && spectatorsSeeEverything) || joiningParticipant->isJudge();
+    bool omniscient = joiningParticipant->isSpectator() && (spectatorsSeeEverything || joiningParticipant->isJudge());
     for (auto *participant : participants.values()) {
         participant->getInfo(event2.add_player_list(), joiningParticipant, omniscient, true);
     }
@@ -794,12 +766,11 @@ void Server_Game::sendGameEventContainer(GameEventContainer *cont,
 
     cont->set_game_id(gameId);
     for (auto *participant : participants.values()) {
-        const bool playerPrivate = (participant->getPlayerId() == privatePlayerId) || participant->isJudge() ||
-                                   (participant->isSpectator() && spectatorsSeeEverything);
+        const bool playerPrivate = (participant->getPlayerId() == privatePlayerId) ||
+                                   (participant->isSpectator() && (spectatorsSeeEverything || participant->isJudge()));
         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);
@@ -815,13 +786,11 @@ 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);
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 e0e7896b7..1c658f2ba 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
@@ -49,7 +49,6 @@ 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;
@@ -197,7 +196,6 @@ public:
     }
     void setActivePlayer(int newPlayer);
     void setActivePhase(int newPhase);
-    qint64 generateArrowId();
     void removeArrows(int newPhase, bool force = false);
     void nextTurn();
     int getSecondsElapsed() const
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 56e3f9f8e..1175e4b57 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
@@ -36,7 +36,6 @@
 #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>
@@ -410,9 +409,6 @@ 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;
     }
 
@@ -436,19 +432,17 @@ Server_Player::cmdIncCounter(const Command_IncCounter &cmd, ResponseContainer &
         return Response::RespContextError;
     }
 
-    const int counterId = cmd.counter_id();
-    Server_Counter *c = counters.value(counterId, nullptr);
+    Server_Counter *c = counters.value(cmd.counter_id(), 0);
     if (!c) {
         return Response::RespNameNotFound;
     }
 
-    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);
-    }
+    c->setCount(c->getCount() + cmd.delta());
+
+    Event_SetCounter event;
+    event.set_counter_id(c->getId());
+    event.set_value(c->getCount());
+    ges.enqueueGameEvent(event, playerId);
 
     return Response::RespOk;
 }
@@ -489,19 +483,17 @@ Server_Player::cmdSetCounter(const Command_SetCounter &cmd, ResponseContainer &
         return Response::RespContextError;
     }
 
-    const int counterId = cmd.counter_id();
-    Server_Counter *c = counters.value(counterId, nullptr);
+    Server_Counter *c = counters.value(cmd.counter_id(), 0);
     if (!c) {
         return Response::RespNameNotFound;
     }
 
-    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);
-    }
+    c->setCount(cmd.value());
+
+    Event_SetCounter event;
+    event.set_counter_id(c->getId());
+    event.set_value(c->getCount());
+    ges.enqueueGameEvent(event, playerId);
 
     return Response::RespOk;
 }
@@ -516,16 +508,15 @@ Server_Player::cmdDelCounter(const Command_DelCounter &cmd, ResponseContainer &
         return Response::RespContextError;
     }
 
-    const int counterId = cmd.counter_id();
-    Server_Counter *counter = counters.value(counterId, nullptr);
+    Server_Counter *counter = counters.value(cmd.counter_id(), 0);
     if (!counter) {
         return Response::RespNameNotFound;
     }
-    counters.remove(counterId);
+    counters.remove(cmd.counter_id());
     delete counter;
 
     Event_DelCounter event;
-    event.set_counter_id(counterId);
+    event.set_counter_id(cmd.counter_id());
     ges.enqueueGameEvent(event, playerId);
 
     return Response::RespOk;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
index 3da9ddc73..a5a74c54c 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
@@ -56,9 +56,8 @@ 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();
 }
@@ -87,25 +86,22 @@ 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());
@@ -144,9 +140,8 @@ 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());
     }
@@ -168,11 +163,9 @@ 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));
@@ -213,22 +206,19 @@ 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;
@@ -242,13 +232,11 @@ 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);
@@ -257,11 +245,9 @@ 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;
 
@@ -286,11 +272,10 @@ 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;
 }
@@ -308,11 +293,9 @@ 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();
 
@@ -336,21 +319,18 @@ 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();
     }
@@ -363,11 +343,9 @@ 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;
 }
@@ -514,9 +492,8 @@ 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);
 
@@ -570,16 +547,13 @@ 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;
 }
@@ -617,9 +591,8 @@ 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);
@@ -629,9 +602,8 @@ 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);
@@ -641,9 +613,8 @@ 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);
@@ -653,9 +624,8 @@ 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_abstractuserinterface.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
index 641be1eed..f9b61ab48 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
@@ -45,28 +45,25 @@ 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::playerRemovedFromGame(Server_Game *game)
@@ -95,21 +92,18 @@ 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_player_reference.h b/libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h
index b478a4244..07b2d3d2b 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h
@@ -24,7 +24,7 @@ public:
     {
         return playerId;
     }
-    bool operator==(const PlayerReference &other) const
+    bool operator==(const PlayerReference &other)
     {
         return ((roomId == other.roomId) && (gameId == other.gameId) && (playerId == other.playerId));
     }
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
index 27ebaf228..bfd8d113c 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
@@ -48,9 +48,8 @@ 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()) {
@@ -65,9 +64,8 @@ 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) {
@@ -169,9 +167,8 @@ Response::ResponseCode Server_ProtocolHandler::processSessionCommandContainer(co
             default:
                 resp = processExtendedSessionCommand(num, sc, rc);
         }
-        if (resp != Response::RespOk) {
+        if (resp != Response::RespOk)
             finalResponseCode = resp;
-        }
     }
     return finalResponseCode;
 }
@@ -179,15 +176,13 @@ 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();
 
@@ -211,9 +206,8 @@ 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;
 }
@@ -238,21 +232,18 @@ 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());
@@ -267,9 +258,8 @@ 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();
 
@@ -284,13 +274,11 @@ 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;
@@ -303,9 +291,8 @@ 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);
 
@@ -315,12 +302,10 @@ 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();
 
@@ -332,9 +317,8 @@ 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;
 }
@@ -342,12 +326,10 @@ 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();
 
@@ -359,9 +341,8 @@ 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;
 }
@@ -369,32 +350,29 @@ 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
         finalResponseCode = Response::RespInvalidCommand;
-    }
 
-    if ((finalResponseCode != Response::RespNothing)) {
+    if ((finalResponseCode != Response::RespNothing))
         sendResponseContainer(responseContainer, finalResponseCode);
-    }
 }
 
 void Server_ProtocolHandler::pingClockTimeout()
@@ -408,13 +386,11 @@ 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();
-            }
         }
     }
 
@@ -422,15 +398,13 @@ 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
     const bool hasPrivLevel = userInfo && QString::fromStdString(userInfo->privlevel()).toLower() != "none";
@@ -470,9 +444,8 @@ 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) {
@@ -520,9 +493,8 @@ 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;
         }
@@ -567,22 +539,19 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
 
     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);
@@ -593,9 +562,8 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
 
 Response::ResponseCode Server_ProtocolHandler::cmdMessage(const Command_Message &cmd, ResponseContainer &rc)
 {
-    if (authState == NotLoggedIn) {
+    if (authState == NotLoggedIn)
         return Response::RespLoginNeeded;
-    }
 
     QReadLocker locker(&server->clientsLock);
 
@@ -631,9 +599,8 @@ 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());
@@ -657,9 +624,8 @@ 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();
@@ -670,15 +636,14 @@ 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);
 
@@ -697,15 +662,13 @@ 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;
@@ -714,25 +677,20 @@ 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);
@@ -764,20 +722,17 @@ 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();
@@ -844,12 +799,10 @@ 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;
@@ -899,9 +852,8 @@ 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_response_containers.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
index 22fb199fb..9b07bdb91 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
@@ -25,9 +25,8 @@ 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)
@@ -45,16 +44,14 @@ 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;
@@ -71,12 +68,10 @@ 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);
@@ -93,10 +88,8 @@ 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_room.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
index 1bd928e09..bfa8912b1 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
@@ -42,9 +42,8 @@ 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();
 
@@ -56,23 +55,19 @@ 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;
@@ -97,14 +92,12 @@ 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();
@@ -113,25 +106,22 @@ 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;
 }
@@ -218,9 +208,8 @@ 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();
 
@@ -238,11 +227,10 @@ 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();
 
@@ -254,9 +242,8 @@ 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.
 
@@ -284,9 +271,8 @@ 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;
 }
@@ -343,15 +329,13 @@ 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;
 }
@@ -421,11 +405,9 @@ 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/serverinfo_user_container.cpp b/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp
index 24e734a4e..77ff38906 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp
@@ -13,11 +13,10 @@ 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()
@@ -46,9 +45,8 @@ 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/libcockatrice/protocol/debug_pb_message.cpp b/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
index c419a68d4..f0c3448b5 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
@@ -58,9 +58,8 @@ 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:
@@ -102,10 +101,6 @@ QString getSafeDebugString(const ::google::protobuf::Message &message)
 #endif // GOOGLE_PROTOBUF_VERSION > 3004000
 
     std::string 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]";
-    }
+    printer.PrintToString(message, &debug_string);
+    return QString::number(size) + " bytes " + QString::fromStdString(debug_string);
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp b/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
index 3e687ef56..1b08c4040 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
@@ -33,16 +33,14 @@ 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 a693ea5a7..d6235858a 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
@@ -7,10 +7,8 @@ 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 b4c7b6ac8..212ab69dd 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
@@ -76,7 +76,6 @@ 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
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_log_notice.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_log_notice.proto
deleted file mode 100644
index ef0dcc102..000000000
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_log_notice.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-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/game_event.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto
index 7d3147701..8682128af 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto
@@ -33,7 +33,6 @@ 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/pending_command.h b/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
index dbe57e7fc..1d2d9ff17 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
+++ b/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
@@ -1,8 +1,8 @@
 /**
  * @file pending_command.h
  * @ingroup Messages
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef PENDING_COMMAND_H
 #define PENDING_COMMAND_H
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
index 82404d351..63072b988 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
+++ b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
@@ -8,11 +8,10 @@ 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;
 }
@@ -20,14 +19,12 @@ 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_sfmt.cpp b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
index 5b38deb3f..5a6d8c862 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
+++ b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
@@ -40,9 +40,8 @@ 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/sfmt/SFMT.c b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c
index fde6367a0..b4ac9308b 100644
--- a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c
+++ b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c
@@ -60,9 +60,7 @@ 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(__AVX2__) && (SFMT_SL1 >= 16) && !(SFMT_N & 1) && !(SFMT_POS1 & 1)
-    #include "SFMT-avx256.h"
-  #elif defined(_MSC_VER)
+  #if 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 34d9e746f..79e012d63 100644
--- a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h
+++ b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h
@@ -88,13 +88,8 @@ union W128_T {
     uint64_t u64[2];
     uint32x4_t si;
 };
-//#elif defined(HAVE_SSE2)
 #elif defined(HAVE_SSE2)
-  #if defined(__AVX2__)
-    #include <immintrin.h>
-  #else 
-    #include <emmintrin.h>
-  #endif
+  #include <emmintrin.h>
 
 /** 128-bit data structure */
 union W128_T {
@@ -117,18 +112,8 @@ 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;
 };
@@ -264,9 +249,9 @@ inline static double sfmt_genrand_real3(sfmt_t * sfmt)
 }
 
 /**
- * converts an unsigned 64-bit integer to double on [0,1)
+ * converts an unsigned 32-bit integer to double on [0,1)
  * with 53-bit resolution.
- * @param v 64-bit unsigned integer
+ * @param v 32-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/libcockatrice/settings/card_database_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
index 4887afd2f..79738f1cd 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
@@ -20,31 +20,17 @@ void CardDatabaseSettings::setIsKnown(QString shortName, bool isknown)
     setValue(isknown, "isknown", "sets", std::move(shortName));
 }
 
-unsigned int CardDatabaseSettings::getSortKey(QString shortName) const
+unsigned int CardDatabaseSettings::getSortKey(QString shortName)
 {
     return getValue("sortkey", "sets", std::move(shortName)).toUInt();
 }
 
-bool CardDatabaseSettings::isEnabled(QString shortName) const
+bool CardDatabaseSettings::isEnabled(QString shortName)
 {
     return getValue("enabled", "sets", std::move(shortName)).toBool();
 }
 
-bool CardDatabaseSettings::isKnown(QString shortName) const
+bool CardDatabaseSettings::isKnown(QString shortName)
 {
     return getValue("isknown", "sets", std::move(shortName)).toBool();
 }
-
-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.endGroup();
-        }
-        s.endGroup();
-    });
-}
\ No newline at end of file
diff --git a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
index 97efb5753..9a176a99b 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
@@ -2,8 +2,8 @@
  * @file card_database_settings.h
  * @ingroup CardDatabase
  * @ingroup CardSettings
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef CARDDATABASESETTINGS_H
 #define CARDDATABASESETTINGS_H
@@ -22,11 +22,9 @@ public:
     void setEnabled(QString shortName, bool enabled) override;
     void setIsKnown(QString shortName, bool isknown) override;
 
-    unsigned int getSortKey(QString shortName) const override;
-    bool isEnabled(QString shortName) const override;
-    bool isKnown(QString shortName) const override;
-
-    void saveSets(const QVector<SetSaveData> &data) override;
+    unsigned int getSortKey(QString shortName) override;
+    bool isEnabled(QString shortName) override;
+    bool isKnown(QString shortName) override;
 
 private:
     explicit CardDatabaseSettings(const QString &settingPath, QObject *parent = nullptr);
diff --git a/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
index a61a4693b..894358be6 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
@@ -15,7 +15,7 @@ void CardOverrideSettings::deleteCardPreferenceOverride(const QString &cardName)
     deleteValue(cardName);
 }
 
-QString CardOverrideSettings::getCardPreferenceOverride(const QString &cardName) const
+QString CardOverrideSettings::getCardPreferenceOverride(const QString &cardName)
 {
     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 cd515d4da..d5ee0287b 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
@@ -1,8 +1,8 @@
 /**
  * @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
@@ -22,7 +22,7 @@ public:
 
     void deleteCardPreferenceOverride(const QString &cardName);
 
-    QString getCardPreferenceOverride(const QString &cardName) const;
+    QString getCardPreferenceOverride(const QString &cardName);
 
 private:
     explicit CardOverrideSettings(const QString &settingPath, QObject *parent = nullptr);
diff --git a/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp b/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
index 5bf6eca30..084696dc1 100644
--- a/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
@@ -11,22 +11,22 @@ DebugSettings::DebugSettings(const QString &settingPath, QObject *parent)
     }
 }
 
-bool DebugSettings::getShowCardId() const
+bool DebugSettings::getShowCardId()
 {
     return getValue("showCardId").toBool();
 }
 
-bool DebugSettings::getLocalGameOnStartup() const
+bool DebugSettings::getLocalGameOnStartup()
 {
     return getValue("onStartup", "localgame").toBool();
 }
 
-int DebugSettings::getLocalGamePlayerCount() const
+int DebugSettings::getLocalGamePlayerCount()
 {
     return getValue("playerCount", "localgame").toInt();
 }
 
-QString DebugSettings::getDeckPathForPlayer(const QString &playerName) const
+QString DebugSettings::getDeckPathForPlayer(const QString &playerName)
 {
     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 acb5cf313..2087b16b3 100644
--- a/libcockatrice_settings/libcockatrice/settings/debug_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/debug_settings.h
@@ -1,8 +1,8 @@
 /**
  * @file debug_settings.h
  * @ingroup CoreSettings
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DEBUG_SETTINGS_H
 #define DEBUG_SETTINGS_H
@@ -17,12 +17,12 @@ class DebugSettings : public SettingsManager
     DebugSettings(const DebugSettings & /*other*/);
 
 public:
-    bool getShowCardId() const;
+    bool getShowCardId();
 
-    bool getLocalGameOnStartup() const;
-    int getLocalGamePlayerCount() const;
+    bool getLocalGameOnStartup();
+    int getLocalGamePlayerCount();
 
-    QString getDeckPathForPlayer(const QString &playerName) const;
+    QString getDeckPathForPlayer(const QString &playerName);
 };
 
 #endif // DEBUG_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.cpp b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
index 66525a598..ad4b81ec5 100644
--- a/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
@@ -18,7 +18,7 @@ void DownloadSettings::setDownloadUrls(const QStringList &downloadURLs)
     setValue(QVariant::fromValue(downloadURLs), "urls");
 }
 
-QStringList DownloadSettings::getAllURLs() const
+QStringList DownloadSettings::getAllURLs()
 {
     return getValue("urls").toStringList();
 }
diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.h b/libcockatrice_settings/libcockatrice/settings/download_settings.h
index 60e59220b..ed3634ea1 100644
--- a/libcockatrice_settings/libcockatrice/settings/download_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/download_settings.h
@@ -1,8 +1,8 @@
 /**
  * @file download_settings.h
  * @ingroup NetworkSettings
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef COCKATRICE_DOWNLOADSETTINGS_H
 #define COCKATRICE_DOWNLOADSETTINGS_H
@@ -19,7 +19,7 @@ class DownloadSettings : public SettingsManager
 public:
     explicit DownloadSettings(const QString &, QObject *);
 
-    QStringList getAllURLs() const;
+    QStringList getAllURLs();
     void setDownloadUrls(const QStringList &downloadURLs);
     void resetToDefaultURLs();
 };
diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
index 4f5bf52ee..e5db3010d 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
@@ -8,11 +8,11 @@ GameFiltersSettings::GameFiltersSettings(const QString &settingPath, QObject *pa
 {
 }
 
-/**
+/*
  * The game type might contain special characters, so to use it in
  * QSettings we just hash it.
  */
-static QString hashGameType(const QString &gameType)
+QString GameFiltersSettings::hashGameType(const QString &gameType) const
 {
     return QCryptographicHash::hash(gameType.toUtf8(), QCryptographicHash::Md5).toHex();
 }
@@ -22,7 +22,7 @@ void GameFiltersSettings::setHideBuddiesOnlyGames(bool hide)
     setValue(hide, "hide_buddies_only_games");
 }
 
-bool GameFiltersSettings::isHideBuddiesOnlyGames() const
+bool GameFiltersSettings::isHideBuddiesOnlyGames()
 {
     QVariant previous = getValue("hide_buddies_only_games");
     return previous == QVariant() ? false : previous.toBool();
@@ -33,7 +33,7 @@ void GameFiltersSettings::setHideFullGames(bool hide)
     setValue(hide, "hide_full_games");
 }
 
-bool GameFiltersSettings::isHideFullGames() const
+bool GameFiltersSettings::isHideFullGames()
 {
     QVariant previous = getValue("hide_full_games");
     return previous == QVariant() ? false : previous.toBool();
@@ -44,7 +44,7 @@ void GameFiltersSettings::setHideGamesThatStarted(bool hide)
     setValue(hide, "hide_games_that_started");
 }
 
-bool GameFiltersSettings::isHideGamesThatStarted() const
+bool GameFiltersSettings::isHideGamesThatStarted()
 {
     QVariant previous = getValue("hide_games_that_started");
     return previous == QVariant() ? false : previous.toBool();
@@ -55,7 +55,7 @@ void GameFiltersSettings::setHidePasswordProtectedGames(bool hide)
     setValue(hide, "hide_password_protected_games");
 }
 
-bool GameFiltersSettings::isHidePasswordProtectedGames() const
+bool GameFiltersSettings::isHidePasswordProtectedGames()
 {
     QVariant previous = getValue("hide_password_protected_games");
     return previous == QVariant() ? false : previous.toBool();
@@ -66,7 +66,7 @@ void GameFiltersSettings::setHideIgnoredUserGames(bool hide)
     setValue(hide, "hide_ignored_user_games");
 }
 
-bool GameFiltersSettings::isHideIgnoredUserGames() const
+bool GameFiltersSettings::isHideIgnoredUserGames()
 {
     QVariant previous = getValue("hide_ignored_user_games");
     return previous == QVariant() ? true : previous.toBool();
@@ -77,7 +77,7 @@ void GameFiltersSettings::setHideNotBuddyCreatedGames(bool hide)
     setValue(hide, "hide_not_buddy_created_games");
 }
 
-bool GameFiltersSettings::isHideNotBuddyCreatedGames() const
+bool GameFiltersSettings::isHideNotBuddyCreatedGames()
 {
     QVariant previous = getValue("hide_not_buddy_created_games");
     return previous == QVariant() ? false : previous.toBool();
@@ -88,7 +88,7 @@ void GameFiltersSettings::setHideOpenDecklistGames(bool hide)
     setValue(hide, "hide_open_decklist_games");
 }
 
-bool GameFiltersSettings::isHideOpenDecklistGames() const
+bool GameFiltersSettings::isHideOpenDecklistGames()
 {
     QVariant previous = getValue("hide_open_decklist_games");
     return previous == QVariant() ? false : previous.toBool();
@@ -99,7 +99,7 @@ void GameFiltersSettings::setGameNameFilter(QString gameName)
     setValue(gameName, "game_name_filter");
 }
 
-QString GameFiltersSettings::getGameNameFilter() const
+QString GameFiltersSettings::getGameNameFilter()
 {
     return getValue("game_name_filter").toString();
 }
@@ -109,7 +109,7 @@ void GameFiltersSettings::setCreatorNameFilters(QStringList creatorName)
     setValue(creatorName, "creator_name_filter");
 }
 
-QStringList GameFiltersSettings::getCreatorNameFilters() const
+QStringList GameFiltersSettings::getCreatorNameFilters()
 {
     return getValue("creator_name_filter").toStringList();
 }
@@ -119,7 +119,7 @@ void GameFiltersSettings::setMinPlayers(int min)
     setValue(min, "min_players");
 }
 
-int GameFiltersSettings::getMinPlayers() const
+int GameFiltersSettings::getMinPlayers()
 {
     QVariant previous = getValue("min_players");
     return previous == QVariant() ? 1 : previous.toInt();
@@ -130,7 +130,7 @@ void GameFiltersSettings::setMaxPlayers(int max)
     setValue(max, "max_players");
 }
 
-int GameFiltersSettings::getMaxPlayers() const
+int GameFiltersSettings::getMaxPlayers()
 {
     QVariant previous = getValue("max_players");
     return previous == QVariant() ? 99 : previous.toInt();
@@ -141,7 +141,7 @@ void GameFiltersSettings::setMaxGameAge(const QTime &maxGameAge)
     setValue(maxGameAge, "max_game_age_time");
 }
 
-QTime GameFiltersSettings::getMaxGameAge() const
+QTime GameFiltersSettings::getMaxGameAge()
 {
     QVariant previous = getValue("max_game_age_time");
     return previous.toTime();
@@ -157,7 +157,7 @@ void GameFiltersSettings::setGameHashedTypeEnabled(QString gametypeHASHED, bool
     setValue(enabled, gametypeHASHED);
 }
 
-bool GameFiltersSettings::isGameTypeEnabled(QString gametype) const
+bool GameFiltersSettings::isGameTypeEnabled(QString gametype)
 {
     QVariant previous = getValue("game_type/" + hashGameType(gametype));
     return previous == QVariant() ? false : previous.toBool();
@@ -168,7 +168,7 @@ void GameFiltersSettings::setShowOnlyIfSpectatorsCanWatch(bool show)
     setValue(show, "show_only_if_spectators_can_watch");
 }
 
-bool GameFiltersSettings::isShowOnlyIfSpectatorsCanWatch() const
+bool GameFiltersSettings::isShowOnlyIfSpectatorsCanWatch()
 {
     QVariant previous = getValue("show_only_if_spectators_can_watch");
     return previous == QVariant() ? false : previous.toBool();
@@ -179,7 +179,7 @@ void GameFiltersSettings::setShowSpectatorPasswordProtected(bool show)
     setValue(show, "show_spectator_password_protected");
 }
 
-bool GameFiltersSettings::isShowSpectatorPasswordProtected() const
+bool GameFiltersSettings::isShowSpectatorPasswordProtected()
 {
     QVariant previous = getValue("show_spectator_password_protected");
     return previous == QVariant() ? false : previous.toBool();
@@ -190,7 +190,7 @@ void GameFiltersSettings::setShowOnlyIfSpectatorsCanChat(bool show)
     setValue(show, "show_only_if_spectators_can_chat");
 }
 
-bool GameFiltersSettings::isShowOnlyIfSpectatorsCanChat() const
+bool GameFiltersSettings::isShowOnlyIfSpectatorsCanChat()
 {
     QVariant previous = getValue("show_only_if_spectators_can_chat");
     return previous == QVariant() ? false : previous.toBool();
@@ -201,7 +201,7 @@ void GameFiltersSettings::setShowOnlyIfSpectatorsCanSeeHands(bool show)
     setValue(show, "show_only_if_spectators_can_see_hands");
 }
 
-bool GameFiltersSettings::isShowOnlyIfSpectatorsCanSeeHands() const
+bool GameFiltersSettings::isShowOnlyIfSpectatorsCanSeeHands()
 {
     QVariant previous = getValue("show_only_if_spectators_can_see_hands");
     return previous == QVariant() ? false : previous.toBool();
diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
index 24f582007..45e9b7441 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
@@ -2,8 +2,8 @@
  * @file game_filters_settings.h
  * @ingroup Lobby
  * @ingroup GameSettings
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef GAMEFILTERSSETTINGS_H
 #define GAMEFILTERSSETTINGS_H
@@ -16,23 +16,23 @@ class GameFiltersSettings : public SettingsManager
     friend class SettingsCache;
 
 public:
-    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 getCreatorNameFilters() 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;
+    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();
 
     void setHideBuddiesOnlyGames(bool hide);
     void setHideIgnoredUserGames(bool hide);
@@ -56,6 +56,8 @@ 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/layouts_settings.cpp b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
index e914dc2d8..f7704cbc7 100644
--- a/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
@@ -23,12 +23,12 @@ void LayoutsSettings::setMainWindowGeometry(const QByteArray &value)
     setValue(value, GEOMETRY_PROP, GROUP_MAIN_WINDOW);
 }
 
-QByteArray LayoutsSettings::getMainWindowGeometry() const
+QByteArray LayoutsSettings::getMainWindowGeometry()
 {
     return getValue(GEOMETRY_PROP, GROUP_MAIN_WINDOW).toByteArray();
 }
 
-QByteArray LayoutsSettings::getDeckEditorLayoutState() const
+QByteArray LayoutsSettings::getDeckEditorLayoutState()
 {
     return getValue(STATE_PROP, GROUP_DECK_EDITOR).toByteArray();
 }
@@ -38,7 +38,7 @@ void LayoutsSettings::setDeckEditorLayoutState(const QByteArray &value)
     setValue(value, STATE_PROP, GROUP_DECK_EDITOR);
 }
 
-QByteArray LayoutsSettings::getDeckEditorGeometry() const
+QByteArray LayoutsSettings::getDeckEditorGeometry()
 {
     return getValue(GEOMETRY_PROP, GROUP_DECK_EDITOR).toByteArray();
 }
@@ -48,7 +48,7 @@ void LayoutsSettings::setDeckEditorGeometry(const QByteArray &value)
     setValue(value, GEOMETRY_PROP, GROUP_DECK_EDITOR);
 }
 
-QByteArray LayoutsSettings::getVisualDeckEditorLayoutState() const
+QByteArray LayoutsSettings::getVisualDeckEditorLayoutState()
 {
     return getValue(STATE_PROP, GROUP_VISUAL_DECK_EDITOR).toByteArray();
 }
@@ -58,7 +58,7 @@ void LayoutsSettings::setVisualDeckEditorLayoutState(const QByteArray &value)
     setValue(value, STATE_PROP, GROUP_VISUAL_DECK_EDITOR);
 }
 
-QByteArray LayoutsSettings::getVisualDeckEditorGeometry() const
+QByteArray LayoutsSettings::getVisualDeckEditorGeometry()
 {
     return getValue(GEOMETRY_PROP, GROUP_VISUAL_DECK_EDITOR).toByteArray();
 }
@@ -68,7 +68,7 @@ void LayoutsSettings::setVisualDeckEditorGeometry(const QByteArray &value)
     setValue(value, GEOMETRY_PROP, GROUP_VISUAL_DECK_EDITOR);
 }
 
-QByteArray LayoutsSettings::getDeckEditorDbHeaderState() const
+QByteArray LayoutsSettings::getDeckEditorDbHeaderState()
 {
     return getValue(STATE_PROP, GROUP_DECK_EDITOR_DB, "header").toByteArray();
 }
@@ -78,7 +78,7 @@ void LayoutsSettings::setDeckEditorDbHeaderState(const QByteArray &value)
     setValue(value, STATE_PROP, GROUP_DECK_EDITOR_DB, "header");
 }
 
-QByteArray LayoutsSettings::getSetsDialogHeaderState() const
+QByteArray LayoutsSettings::getSetsDialogHeaderState()
 {
     return getValue(STATE_PROP, GROUP_SETS_DIALOG, "header").toByteArray();
 }
@@ -93,7 +93,7 @@ void LayoutsSettings::setSetsDialogGeometry(const QByteArray &value)
     setValue(value, GEOMETRY_PROP, GROUP_SETS_DIALOG);
 }
 
-QByteArray LayoutsSettings::getSetsDialogGeometry() const
+QByteArray LayoutsSettings::getSetsDialogGeometry()
 {
     return getValue(GEOMETRY_PROP, GROUP_SETS_DIALOG).toByteArray();
 }
@@ -103,7 +103,7 @@ void LayoutsSettings::setTokenDialogGeometry(const QByteArray &value)
     setValue(value, GEOMETRY_PROP, GROUP_TOKEN_DIALOG);
 }
 
-QByteArray LayoutsSettings::getTokenDialogGeometry() const
+QByteArray LayoutsSettings::getTokenDialogGeometry()
 {
     return getValue(GEOMETRY_PROP, GROUP_TOKEN_DIALOG).toByteArray();
 }
@@ -118,12 +118,12 @@ void LayoutsSettings::setGamePlayAreaState(const QByteArray &value)
     setValue(value, STATE_PROP, GROUP_GAME_PLAY_AREA);
 }
 
-QByteArray LayoutsSettings::getGamePlayAreaLayoutState() const
+QByteArray LayoutsSettings::getGamePlayAreaLayoutState()
 {
     return getValue(STATE_PROP, GROUP_GAME_PLAY_AREA).toByteArray();
 }
 
-QByteArray LayoutsSettings::getGamePlayAreaGeometry() const
+QByteArray LayoutsSettings::getGamePlayAreaGeometry()
 {
     return getValue(GEOMETRY_PROP, GROUP_GAME_PLAY_AREA).toByteArray();
 }
@@ -138,12 +138,12 @@ void LayoutsSettings::setReplayPlayAreaState(const QByteArray &value)
     setValue(value, STATE_PROP, GROUP_REPLAY_PLAY_AREA);
 }
 
-QByteArray LayoutsSettings::getReplayPlayAreaLayoutState() const
+QByteArray LayoutsSettings::getReplayPlayAreaLayoutState()
 {
     return getValue(STATE_PROP, GROUP_REPLAY_PLAY_AREA).toByteArray();
 }
 
-QByteArray LayoutsSettings::getReplayPlayAreaGeometry() const
+QByteArray LayoutsSettings::getReplayPlayAreaGeometry()
 {
     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 d5f26b61b..cab9a456e 100644
--- a/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
@@ -1,8 +1,8 @@
 /**
  * @file layouts_settings.h
  * @ingroup CoreSettings
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef LAYOUTSSETTINGS_H
 #define LAYOUTSSETTINGS_H
@@ -36,24 +36,24 @@ public:
     void setReplayPlayAreaGeometry(const QByteArray &value);
     void setReplayPlayAreaState(const QByteArray &value);
 
-    QByteArray getMainWindowGeometry() const;
+    QByteArray getMainWindowGeometry();
 
-    QByteArray getDeckEditorLayoutState() const;
-    QByteArray getDeckEditorGeometry() const;
+    QByteArray getDeckEditorLayoutState();
+    QByteArray getDeckEditorGeometry();
 
-    QByteArray getVisualDeckEditorLayoutState() const;
-    QByteArray getVisualDeckEditorGeometry() const;
+    QByteArray getVisualDeckEditorLayoutState();
+    QByteArray getVisualDeckEditorGeometry();
 
-    QByteArray getDeckEditorDbHeaderState() const;
-    QByteArray getSetsDialogHeaderState() const;
-    QByteArray getSetsDialogGeometry() const;
-    QByteArray getTokenDialogGeometry() const;
+    QByteArray getDeckEditorDbHeaderState();
+    QByteArray getSetsDialogHeaderState();
+    QByteArray getSetsDialogGeometry();
+    QByteArray getTokenDialogGeometry();
 
-    QByteArray getGamePlayAreaLayoutState() const;
-    QByteArray getGamePlayAreaGeometry() const;
+    QByteArray getGamePlayAreaLayoutState();
+    QByteArray getGamePlayAreaGeometry();
 
-    QByteArray getReplayPlayAreaLayoutState() const;
-    QByteArray getReplayPlayAreaGeometry() const;
+    QByteArray getReplayPlayAreaLayoutState();
+    QByteArray getReplayPlayAreaGeometry();
 signals:
 
 public slots:
diff --git a/libcockatrice_settings/libcockatrice/settings/message_settings.cpp b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
index 50da39df6..761c94484 100644
--- a/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
@@ -5,12 +5,12 @@ MessageSettings::MessageSettings(const QString &settingPath, QObject *parent)
 {
 }
 
-QString MessageSettings::getMessageAt(int index) const
+QString MessageSettings::getMessageAt(int index)
 {
     return getValue(QString("msg%1").arg(index)).toString();
 }
 
-int MessageSettings::getCount() const
+int MessageSettings::getCount()
 {
     return getValue("count").toInt();
 }
diff --git a/libcockatrice_settings/libcockatrice/settings/message_settings.h b/libcockatrice_settings/libcockatrice/settings/message_settings.h
index 8276aa39d..265c455e1 100644
--- a/libcockatrice_settings/libcockatrice/settings/message_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/message_settings.h
@@ -1,8 +1,8 @@
 /**
  * @file message_settings.h
  * @ingroup NetworkSettings
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef MESSAGESETTINGS_H
 #define MESSAGESETTINGS_H
@@ -15,8 +15,8 @@ class MessageSettings : public SettingsManager
     friend class SettingsCache;
 
 public:
-    int getCount() const;
-    QString getMessageAt(int index) const;
+    int getCount();
+    QString getMessageAt(int index);
 
     void setCount(int count);
     void setMessageAt(int index, QString message);
diff --git a/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp b/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
index 76bc4069e..e64dd7494 100644
--- a/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
@@ -7,7 +7,7 @@ RecentsSettings::RecentsSettings(const QString &settingPath, QObject *parent)
 {
 }
 
-QStringList RecentsSettings::getRecentlyOpenedDeckPaths() const
+QStringList RecentsSettings::getRecentlyOpenedDeckPaths()
 {
     return getValue("deckpaths").toStringList();
 }
@@ -31,7 +31,7 @@ void RecentsSettings::updateRecentlyOpenedDeckPaths(const QString &deckPath)
     emit recentlyOpenedDeckPathsChanged();
 }
 
-QString RecentsSettings::getLatestDeckDirPath() const
+QString RecentsSettings::getLatestDeckDirPath()
 {
     return getValue("latestDeckDir", "dirs").toString();
 }
diff --git a/libcockatrice_settings/libcockatrice/settings/recents_settings.h b/libcockatrice_settings/libcockatrice/settings/recents_settings.h
index 01b2a37bc..23c8f1a9f 100644
--- a/libcockatrice_settings/libcockatrice/settings/recents_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/recents_settings.h
@@ -1,8 +1,8 @@
 /**
  * @file recents_settings.h
  * @ingroup DeckSettings
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef RECENTS_SETTINGS_H
 #define RECENTS_SETTINGS_H
@@ -18,11 +18,11 @@ class RecentsSettings : public SettingsManager
     RecentsSettings(const RecentsSettings & /*other*/);
 
 public:
-    QStringList getRecentlyOpenedDeckPaths() const;
+    QStringList getRecentlyOpenedDeckPaths();
     void clearRecentlyOpenedDeckPaths();
     void updateRecentlyOpenedDeckPaths(const QString &deckPath);
 
-    QString getLatestDeckDirPath() const;
+    QString getLatestDeckDirPath();
     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 d9b98e036..5f69f47c9 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
@@ -13,7 +13,7 @@ void ServersSettings::setPreviousHostLogin(int previous)
     setValue(previous, "previoushostlogin");
 }
 
-int ServersSettings::getPreviousHostLogin() const
+int ServersSettings::getPreviousHostLogin()
 {
     QVariant previous = getValue("previoushostlogin");
     return previous == QVariant() ? 1 : previous.toInt();
@@ -24,7 +24,7 @@ void ServersSettings::setPreviousHostList(QStringList list)
     setValue(list, "previoushosts");
 }
 
-QStringList ServersSettings::getPreviousHostList() const
+QStringList ServersSettings::getPreviousHostList()
 {
     return getValue("previoushosts").toStringList();
 }
@@ -48,33 +48,31 @@ QString ServersSettings::getSite(QString defaultSite)
     return site == QVariant() ? std::move(defaultSite) : site.toString();
 }
 
-QString ServersSettings::getPrevioushostName() const
+QString ServersSettings::getPrevioushostName()
 {
     QVariant value = getValue("previoushostName");
     return value == QVariant() ? "Rooster Ranges" : value.toString();
 }
 
-int ServersSettings::getPrevioushostindex(const QString &saveName) const
+int ServersSettings::getPrevioushostindex(const QString &saveName)
 {
     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) const
+QString ServersSettings::getHostname(QString defaultHost)
 {
     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) const
+QString ServersSettings::getPort(QString defaultPort)
 {
     int index = getPrevioushostindex(getPrevioushostName());
     QVariant port = getValue(QString("port%1").arg(index), "server", "server_details");
@@ -82,7 +80,7 @@ QString ServersSettings::getPort(QString defaultPort) const
     return port == QVariant() ? std::move(defaultPort) : port.toString();
 }
 
-QString ServersSettings::getPlayerName(QString defaultName) const
+QString ServersSettings::getPlayerName(QString defaultName)
 {
     int index = getPrevioushostindex(getPrevioushostName());
     QVariant name = getValue(QString("username%1").arg(index), "server", "server_details");
@@ -94,14 +92,13 @@ 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() const
+bool ServersSettings::getSavePassword()
 {
     int index = getPrevioushostindex(getPrevioushostName());
     bool save = getValue(QString("savePassword%1").arg(index), "server", "server_details").toBool();
@@ -113,7 +110,7 @@ void ServersSettings::setAutoConnect(int autoconnect)
     setValue(autoconnect, "auto_connect");
 }
 
-int ServersSettings::getAutoConnect() const
+int ServersSettings::getAutoConnect()
 {
     QVariant autoconnect = getValue("auto_connect");
     return autoconnect == QVariant() ? 0 : autoconnect.toInt();
@@ -124,7 +121,7 @@ void ServersSettings::setFPHostName(QString hostname)
     setValue(hostname, "fphostname");
 }
 
-QString ServersSettings::getFPHostname(QString defaultHost) const
+QString ServersSettings::getFPHostname(QString defaultHost)
 {
     QVariant hostname = getValue("fphostname");
     return hostname == QVariant() ? std::move(defaultHost) : hostname.toString();
@@ -135,7 +132,7 @@ void ServersSettings::setFPPort(QString port)
     setValue(port, "fpport");
 }
 
-QString ServersSettings::getFPPort(QString defaultPort) const
+QString ServersSettings::getFPPort(QString defaultPort)
 {
     QVariant port = getValue("fpport");
     return port == QVariant() ? std::move(defaultPort) : port.toString();
@@ -146,7 +143,7 @@ void ServersSettings::setFPPlayerName(QString playerName)
     setValue(playerName, "fpplayername");
 }
 
-QString ServersSettings::getFPPlayerName(QString defaultName) const
+QString ServersSettings::getFPPlayerName(QString defaultName)
 {
     QVariant name = getValue("fpplayername");
     return name == QVariant() ? std::move(defaultName) : name.toString();
@@ -157,7 +154,7 @@ void ServersSettings::setClearDebugLogStatus(bool abIsChecked)
     setValue(abIsChecked, "save_debug_log");
 }
 
-bool ServersSettings::getClearDebugLogStatus(bool abDefaultValue) const
+bool ServersSettings::getClearDebugLogStatus(bool abDefaultValue)
 {
     QVariant cbFlushLog = getValue("save_debug_log");
     return cbFlushLog == QVariant() ? abDefaultValue : cbFlushLog.toBool();
@@ -171,9 +168,8 @@ void ServersSettings::addNewServer(const QString &saveName,
                                    bool savePassword,
                                    const QString &site)
 {
-    if (updateExistingServer(saveName, serv, port, username, password, savePassword, site)) {
+    if (updateExistingServer(saveName, serv, port, username, password, savePassword, site))
         return;
-    }
 
     int index = getValue("totalServers", "server", "server_details").toInt() + 1;
 
diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.h b/libcockatrice_settings/libcockatrice/settings/servers_settings.h
index 40fa996fb..4d92c4647 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
@@ -22,21 +22,21 @@ class ServersSettings : public SettingsManager
     friend class SettingsCache;
 
 public:
-    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;
+    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 = "");
     QString getPassword();
     QString getSaveName(QString defaultname = "");
     QString getSite(QString defaultName = "");
-    bool getSavePassword() const;
-    int getAutoConnect() const;
+    bool getSavePassword();
+    int getAutoConnect();
 
     void setPreviousHostLogin(int previous);
     void setPrevioushostName(const QString &);
@@ -67,7 +67,7 @@ public:
                                          QString port = QString(),
                                          QString site = QString());
     void setClearDebugLogStatus(bool abIsChecked);
-    bool getClearDebugLogStatus(bool abDefaultValue) const;
+    bool getClearDebugLogStatus(bool abDefaultValue);
 
 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 b66edd630..ede5a2027 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
@@ -1,23 +1,16 @@
 #include "settings_manager.h"
 
-SettingsManager::SettingsManager(const QString &_settingPath,
+SettingsManager::SettingsManager(const QString &settingPath,
                                  const QString &_defaultGroup,
                                  const QString &_defaultSubGroup,
                                  QObject *parent)
-    : QObject(parent), settingPath(_settingPath), defaultGroup(_defaultGroup), defaultSubGroup(_defaultSubGroup)
+    : QObject(parent), settings(settingPath, QSettings::IniFormat), 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);
     }
@@ -42,8 +35,6 @@ void SettingsManager::setValue(const QVariant &value,
                                const QString &group,
                                const QString &subGroup)
 {
-    auto settings = getSettings();
-
     if (!group.isEmpty()) {
         settings.beginGroup(group);
     }
@@ -65,8 +56,6 @@ void SettingsManager::setValue(const QVariant &value,
 
 void SettingsManager::deleteValue(const QString &name)
 {
-    auto settings = getSettings();
-
     if (!defaultGroup.isEmpty()) {
         settings.beginGroup(defaultGroup);
     }
@@ -88,8 +77,6 @@ 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);
     }
@@ -109,10 +96,8 @@ void SettingsManager::deleteValue(const QString &name, const QString &group, con
     }
 }
 
-QVariant SettingsManager::getValue(const QString &name) const
+QVariant SettingsManager::getValue(const QString &name)
 {
-    auto settings = getSettings();
-
     if (!defaultGroup.isEmpty()) {
         settings.beginGroup(defaultGroup);
     }
@@ -134,10 +119,8 @@ QVariant SettingsManager::getValue(const QString &name) const
     return value;
 }
 
-QVariant SettingsManager::getValue(const QString &name, const QString &group, const QString &subGroup) const
+QVariant SettingsManager::getValue(const QString &name, const QString &group, const QString &subGroup)
 {
-    auto settings = getSettings();
-
     if (!group.isEmpty()) {
         settings.beginGroup(group);
     }
@@ -159,21 +142,10 @@ QVariant SettingsManager::getValue(const QString &name, const QString &group, co
     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 4213cf4c1..3592d8f8c 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.h
+++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.h
@@ -1,8 +1,8 @@
 /**
  * @file settings_manager.h
  * @ingroup Settings
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef SETTINGSMANAGER_H
 #define SETTINGSMANAGER_H
@@ -14,33 +14,23 @@
 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) const;
-    QVariant getValue(const QString &name, const QString &group, const QString &subGroup = QString()) const;
-    void batchWrite(std::function<void(QSettings &)> batchWriteFunction);
-
+    QVariant getValue(const QString &name);
+    QVariant getValue(const QString &name, const QString &group, const QString &subGroup = QString());
     void sync();
 
 protected:
-    QString settingPath;
+    QSettings settings;
     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_utility/libcockatrice/utility/color.h b/libcockatrice_utility/libcockatrice/utility/color.h
index 6afe984bd..f02df3a0e 100644
--- a/libcockatrice_utility/libcockatrice/utility/color.h
+++ b/libcockatrice_utility/libcockatrice/utility/color.h
@@ -22,7 +22,6 @@ inline color convertQColorToColor(const QColor &c)
     return result;
 }
 
-#include <QMap>
 #include <QSet>
 
 namespace GameSpecificColors
@@ -46,13 +45,11 @@ inline QColor colorHelper(const QString &name)
         {"Land", QColor(110, 80, 50)},
     };
 
-    if (colorMap.contains(name)) {
+    if (colorMap.contains(name))
         return colorMap[name];
-    }
 
-    if (name.length() == 1 && colorMap.contains(name.toUpper())) {
+    if (name.length() == 1 && colorMap.contains(name.toUpper()))
         return colorMap[name.toUpper()];
-    }
 
     uint h = qHash(name);
     int r = 100 + (h % 120);
diff --git a/libcockatrice_utility/libcockatrice/utility/days_years_between.h b/libcockatrice_utility/libcockatrice/utility/days_years_between.h
deleted file mode 100644
index c0f5da23a..000000000
--- a/libcockatrice_utility/libcockatrice/utility/days_years_between.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#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};
-}
diff --git a/libcockatrice_utility/libcockatrice/utility/expression.cpp b/libcockatrice_utility/libcockatrice/utility/expression.cpp
index 718b0fe18..3b2e815d1 100644
--- a/libcockatrice_utility/libcockatrice/utility/expression.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/expression.cpp
@@ -20,7 +20,7 @@ peg::parser math(R"(
 
     NUMBER       <-  < '-'? [0-9]+ >
     NAME         <-  < [a-z][a-z0-9]* >
-    VARIABLE     <-  < [xX] >
+    VARIABLE     <-  < [x] >
     FUNCTION     <-  NAME '(' EXPRESSION ( [,\n] EXPRESSION )* ')'
 
     %whitespace  <-  [ \t\r]*
@@ -54,9 +54,8 @@ 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 f39d325fb..cfb972f91 100644
--- a/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
@@ -9,12 +9,10 @@ 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 3da730e53..e83235470 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/peglib.h b/libcockatrice_utility/libcockatrice/utility/peglib.h
index e7e558dff..6a5b87b2d 100644
--- a/libcockatrice_utility/libcockatrice/utility/peglib.h
+++ b/libcockatrice_utility/libcockatrice/utility/peglib.h
@@ -1,4 +1,4 @@
-//
+//
 //  peglib.h
 //
 //  Copyright (c) 2022 Yuji Hirose. All rights reserved.
@@ -17,7 +17,6 @@
 
 #include <algorithm>
 #include <any>
-#include <bitset>
 #include <cassert>
 #include <cctype>
 #if __has_include(<charconv>)
@@ -31,13 +30,11 @@
 #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
@@ -54,28 +51,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;
 };
 
 /*-----------------------------------------------------------------------------
@@ -83,136 +80,130 @@ 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;) {
-    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;
+    size_t count = 0;
+    for (size_t i = 0; i < l; i += codepoint_length(s8 + i, l - i)) {
+        count++;
     }
-    i += len;
-    count++;
-  }
-  return 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...
+    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;
-  } 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++;
+    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));
     }
-    out += decode_codepoint(&s8[beg], (i - beg));
-  }
-  return out;
+    return out;
 }
 
 template <typename T> const char *u8(const T *s) {
-  return reinterpret_cast<const char *>(s);
+    return reinterpret_cast<const char *>(s);
 }
 
 /*-----------------------------------------------------------------------------
@@ -220,23 +211,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());
 }
 
 /*-----------------------------------------------------------------------------
@@ -244,121 +235,120 @@ 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++;
-      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 '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++;
+            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++;
+        }
     }
-  }
-  return r;
+    return r;
 }
 
 /*-----------------------------------------------------------------------------
@@ -366,26 +356,19 @@ 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;
-}
-
-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;
+    } else {
+        auto s = std::string(sv);
+        std::istringstream ss(s);
+        ss >> n;
+    }
+    return n;
 }
 
 /*-----------------------------------------------------------------------------
@@ -394,75 +377,75 @@ inline std::string to_lower(std::string s) {
 
 class Trie {
 public:
-  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;
+    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++;
         }
-      }
-      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_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(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();
         }
-        if (it->second.done) { done = true; }
-      }
-      len += 1;
+
+        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;
     }
-    return match_len;
-  }
 
-  size_t size() const { return dic_.size(); }
-  size_t items_count() const { return items_count_; }
-
-  friend struct ComputeFirstSet;
+    size_t size() const { return dic_.size(); }
 
 private:
-  struct Info {
-    bool done;
-    bool match;
-    size_t id;
-  };
+    std::string to_lower(std::string s) const {
+        for (char &c : s) {
+            c = std::tolower(c);
+        }
+        return s;
+    }
 
-  // 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_;
+    struct Info {
+        bool done;
+        bool match;
+        size_t id;
+    };
 
-  bool ignore_case_;
-  size_t items_count_;
-  size_t max_len_ = 0;
+    //! \todo Use unordered_map when heterogeneous lookup is supported in C++20
+    //! \todo std::unordered_map<std::string, Info> dic_;
+    std::map<std::string, Info, std::less<>> dic_;
+
+    bool ignore_case_;
 };
 
 /*-----------------------------------------------------------------------------
@@ -473,21 +456,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;
+    while (p < cur) {
+        if (*p == '\n') {
+            no++;
+            col_ptr = p + 1;
+        }
+        p++;
     }
-    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);
 }
 
 /*
@@ -495,19 +478,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);
+    return str2tag_core(s, l, 0);
 }
 
 } // namespace udl
@@ -518,113 +501,126 @@ 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];
-  }
-
-  // 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]));
+    std::string_view token(size_t id = 0) const {
+        if (tokens.empty()) { return sv_; }
+        assert(id < tokens.size());
+        return tokens[id];
     }
-    return r;
-  }
 
-  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;
+    // 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;
 
 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>
@@ -641,74 +637,30 @@ 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 std::any &predicate_data) const {
-    return fn_(vs, dt, predicate_data);
-  }
+    std::any operator()(SemanticValues &vs, std::any &dt) const {
+        return fn_(vs, dt);
+    }
 
 private:
-  using Fty = std::function<std::any(SemanticValues &vs, std::any &dt,
-                                     const std::any &predicate_data)>;
+    using Fty = std::function<std::any(SemanticValues &vs, std::any &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);
-      };
+    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); };
+        }
     }
-  }
 
-  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_;
+    Fty fn_;
 };
 
 /*
@@ -730,67 +682,67 @@ using Log = std::function<void(size_t line, size_t col, const std::string &msg,
 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 add(const char *error_literal, const Definition *error_rule) {
-    for (const auto &[t, r] : expected_tokens) {
-      if (t == error_literal && r == error_rule) { return; }
+    void clear() {
+        error_pos = nullptr;
+        expected_tokens.clear();
+        message_pos = nullptr;
+        message.clear();
     }
-    expected_tokens.emplace_back(error_literal, error_rule);
-  }
 
-  void output_log(const Log &log, const char *s, size_t n);
+    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);
 
 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++;
+    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);
         }
-      }
-
-      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();
     }
-    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();
+    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;
     }
-    return str;
-  }
 };
 
 /*
@@ -810,269 +762,211 @@ using TracerStartOrEnd = std::function<void(std::any &trace_data)>;
 
 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::shared_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;
+    std::vector<std::vector<std::shared_ptr<Ope>>> args_stack;
 
-  size_t in_token_boundary_count = 0;
+    size_t in_token_boundary_count = 0;
 
-  std::shared_ptr<Ope> whitespaceOpe;
-  bool in_whitespace = false;
+    std::shared_ptr<Ope> whitespaceOpe;
+    bool in_whitespace = false;
 
-  std::shared_ptr<Ope> wordOpe;
+    std::shared_ptr<Ope> wordOpe;
 
-  std::vector<std::pair<std::string_view, std::string>> capture_entries;
+    std::vector<std::map<std::string_view, std::string>> capture_scope_stack;
+    size_t capture_scope_stack_size = 0;
 
-  std::vector<bool> cut_stack;
+    std::vector<bool> cut_stack;
 
-  const size_t def_count;
-  const bool enablePackratParsing;
-  std::vector<bool> cache_registered;
-  std::vector<bool> cache_success;
+    const size_t def_count;
+    const bool enablePackratParsing;
+    std::vector<bool> cache_registered;
+    std::vector<bool> cache_success;
 
-  std::map<std::pair<size_t, size_t>, std::tuple<size_t, std::any>>
-      cache_values;
+    std::map<std::pair<size_t, size_t>, std::tuple<size_t, std::any>>
+        cache_values;
 
-  // Left recursion support
-  struct LRMemo {
-    size_t len = static_cast<size_t>(-1);
-    std::any val;
-  };
-  std::map<std::pair<const Definition *, const char *>, LRMemo> lr_memo;
+    TracerEnter tracer_enter;
+    TracerLeave tracer_leave;
+    std::any trace_data;
+    const bool verbose_trace;
 
-  // Rules whose lr_memo was hit during the current parse scope.
-  // Used to track LR cycle membership.
-  std::set<const Definition *> lr_refs_hit;
+    Log log;
 
-  // Rules currently in their seeding/growing phase at a given position.
-  // Protected from having their lr_memo erased by inner growers.
-  std::set<std::pair<const Definition *, const char *>> lr_active_seeds;
+    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) {
 
-  void clear_packrat_cache(const char *pos, size_t def_id) {
-    if (!enablePackratParsing) { return; }
-    auto col = static_cast<size_t>(pos - s);
-    auto idx = def_count * col + def_id;
-    if (idx < cache_registered.size()) {
-      cache_registered[idx] = false;
-      cache_success[idx] = false;
-    }
-    cache_values.erase(std::make_pair(col, def_id));
-  }
-
-  void write_packrat_cache(const char *pos, size_t def_id, size_t len,
-                           const std::any &val) {
-    if (!enablePackratParsing) { return; }
-    auto col = pos - s;
-    auto idx = def_count * static_cast<size_t>(col) + def_id;
-    if (idx >= cache_registered.size()) { return; }
-    cache_registered[idx] = true;
-    cache_success[idx] = true;
-    auto key = std::pair(col, def_id);
-    cache_values[key] = std::pair(len, val);
-  }
-
-  TracerEnter tracer_enter;
-  TracerLeave tracer_leave;
-  std::any trace_data;
-  const bool verbose_trace;
-
-  Log log;
-
-  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) {
-
-    push_args({});
-  }
-
-  ~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;
-
-  // Per-rule packrat filter: if set, only rules with filter[def_id]=true
-  // use full memoization (cache_values map). Others use bitvector-only
-  // re-entry guard.
-  const std::vector<bool> *packrat_rule_filter = 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;
+        push_args({});
+        push_capture_scope();
     }
 
-    auto col = a_s - s;
-    auto idx = def_count * static_cast<size_t>(col) + def_id;
+    ~Context() {
+        pop_capture_scope();
 
-    if (cache_registered[idx]) {
-      if (packrat_stats && def_id < packrat_stats->size()) {
-        (*packrat_stats)[def_id].hits++;
-      }
-      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 {
-      // Pre-register as failure (re-entry guard for all rules)
-      cache_registered[idx] = true;
-      cache_success[idx] = false;
-
-      if (packrat_stats && def_id < packrat_stats->size()) {
-        (*packrat_stats)[def_id].misses++;
-      }
-
-      fn(val);
-
-      bool full_memo =
-          !packrat_rule_filter || (def_id < packrat_rule_filter->size() &&
-                                   (*packrat_rule_filter)[def_id]);
-      if (full_memo) {
-        if (success(len)) { write_packrat_cache(a_s, def_id, len, val); }
-      } else {
-        // Guard-only: undo registration so future calls re-parse
-        cache_registered[idx] = false;
-      }
-      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_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(); }
+        assert(!value_stack_size);
+        assert(!capture_scope_stack_size);
+        assert(cut_stack.empty());
     }
 
-    auto &vs = *value_stack[value_stack_size++];
-    vs.path = path;
-    vs.ss = s;
-    return vs;
-  }
+    Context(const Context &) = delete;
+    Context(Context &&) = delete;
+    Context operator=(const Context &) = delete;
 
-  void pop_semantic_values_scope() { value_stack_size--; }
+    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;
+        }
 
-  // Arguments
-  void push_args(std::vector<std::shared_ptr<Ope>> &&args) {
-    args_stack.emplace_back(std::move(args));
-  }
+        auto col = a_s - s;
+        auto idx = def_count * static_cast<size_t>(col) + def_id;
 
-  void pop_args() { args_stack.pop_back(); }
+        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;
+        }
+    }
 
-  const std::vector<std::shared_ptr<Ope>> &top_args() const {
-    return args_stack[args_stack.size() - 1];
-  }
+    SemanticValues &push() {
+        push_capture_scope();
+        return push_semantic_values_scope();
+    }
 
-  // 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;
-  };
+    void pop() {
+        pop_capture_scope();
+        pop_semantic_values_scope();
+    }
 
-  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()};
-  }
+    // 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(); }
+        }
 
-  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);
-  }
+        auto &vs = *value_stack[value_stack_size++];
+        vs.path = path;
+        vs.ss = s;
+        return vs;
+    }
 
-  // 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);
+    void pop_semantic_values_scope() { value_stack_size--; }
 
-  // Error
-  void set_error_pos(const char *a_s, const char *literal = nullptr);
+    // Arguments
+    void push_args(std::vector<std::shared_ptr<Ope>> &&args) {
+        args_stack.emplace_back(args);
+    }
 
-  // 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;
+    void pop_args() { args_stack.pop_back(); }
 
-  // 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);
-    });
+    const std::vector<std::shared_ptr<Ope>> &top_args() const {
+        return args_stack[args_stack.size() - 1];
+    }
 
-    auto pos = static_cast<size_t>(std::distance(s, cur));
+    // 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++;
+    }
 
-    auto it = std::lower_bound(
-        source_line_index.begin(), source_line_index.end(), pos,
-        [](size_t element, size_t value) { return element < value; });
+    void pop_capture_scope() { capture_scope_stack_size--; }
 
-    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);
-  }
+    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;
+        }
+    }
 
-  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;
+    // 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;
+
+    // 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 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);
+    }
+
+    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;
 };
 
 /*
@@ -1080,590 +974,416 @@ 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;
-
-  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; });
-  }
+    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;
 };
 
 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_(std::move(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_(opes) {}
 
-  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 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 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_;
-
-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, [](unsigned char ch) {
-        return static_cast<char>(std::tolower(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
-  }
+    std::vector<std::shared_ptr<Ope>> opes_;
 };
 
 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) {
-    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;
-  }
+    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) {}
 
-  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 se = scope_exit([&]() {
-      if (!for_label_) { c.cut_stack.pop_back(); }
-    });
+        if (!for_label_) { c.cut_stack.push_back(false); }
+        auto se1 = scope_exit([&]() {
+            if (!for_label_) { c.cut_stack.pop_back(); }
+        });
 
-    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 && (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);
-              }
+        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;
             }
-          }
-          id++;
-          continue;
+
+            id++;
         }
-      }
 
-      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++;
+        return len;
     }
 
-    c.error_info.keep_previous_token = false;
-    return len;
-  }
+    void accept(Visitor &v) override;
 
-  void accept(Visitor &v) override;
+    size_t size() const { return opes_.size(); }
 
-  size_t size() const { return opes_.size(); }
-
-  std::vector<std::shared_ptr<Ope>> opes_;
-  bool for_label_ = false;
-  std::vector<FirstSet> first_sets_;
+    std::vector<std::shared_ptr<Ope>> opes_;
+    bool for_label_ = false;
 };
 
 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 {
-    // 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++;
+    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++;
         }
-      } else {
-        auto limit = std::min(n, max_);
-        while (i < limit && 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++;
         }
-      }
-      if (i < min_) {
-        c.set_error_pos(s + i);
-        return static_cast<size_t>(-1);
-      }
-      return i;
+        return i;
     }
 
-    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++;
+    void accept(Visitor &v) override;
+
+    bool is_zom() const {
+        return min_ == 0 && max_ == 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++;
+    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());
     }
-    return i;
-  }
 
-  void accept(Visitor &v) override;
+    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());
+    }
 
-  bool is_zom() const {
-    return min_ == 0 && max_ == 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);
+    }
 
-  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
+    std::shared_ptr<Ope> ope_;
+    size_t min_;
+    size_t max_;
 };
 
 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 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;
+    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;
+        }
     }
-  }
 
-  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 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;
+    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;
+        }
     }
-  }
 
-  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) {
-    is_choice_like = true;
-  }
+    Dictionary(const std::vector<std::string> &v, bool ignore_case)
+        : trie_(v, ignore_case) {}
 
-  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_(std::move(s)), ignore_case_(ignore_case),
-        lower_lit_(ignore_case ? to_lower(lit_) : std::string()),
-        is_word_(false) {}
+    LiteralString(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) {}
+    LiteralString(const std::string &s, bool ignore_case)
+        : lit_(s), ignore_case_(ignore_case), 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_;
-  std::string lower_lit_; // pre-computed for ignore_case
-  mutable std::once_flag init_is_word_;
-  mutable bool is_word_;
+    std::string lit_;
+    bool 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());
-    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);
-    }
-
-    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;
+    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());
     }
 
-    if (negated_) {
-      return len;
-    } else {
-      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());
     }
-  }
 
-  void accept(Visitor &v) override;
+    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);
+        }
 
-  friend struct ComputeFirstSet;
+        char32_t cp = 0;
+        auto len = decode_codepoint(s, n, cp);
 
-  bool is_ascii_only() const { return is_ascii_only_; }
-  const std::bitset<256> &ascii_bitset() const { return ascii_bitset_; }
+        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;
+                }
+            }
+        }
+
+        if (negated_) {
+            return len;
+        } else {
+            c.set_error_pos(s);
+            return static_cast<size_t>(-1);
+        }
+    }
+
+    void accept(Visitor &v) override;
 
 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;
-    }
-  }
-
-  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);
+    bool in_range(const std::pair<char32_t, char32_t> &range, char32_t cp) const {
         if (ignore_case_) {
-          ascii_bitset_.set(static_cast<unsigned char>(std::toupper(ch)));
-          ascii_bitset_.set(static_cast<unsigned char>(std::tolower(ch)));
+            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_;
-  std::bitset<256> ascii_bitset_;
-  bool is_ascii_only_ = false;
+    std::vector<std::pair<char32_t, char32_t>> ranges_;
+    bool negated_;
+    bool ignore_case_;
 };
 
 class Character : public Ope, public std::enable_shared_from_this<Character> {
 public:
-  Character(char32_t ch) : ch_(ch) {}
+    Character(char 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) {
-      c.set_error_pos(s);
-      return static_cast<size_t>(-1);
+    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;
     }
 
-    char32_t cp = 0;
-    auto len = decode_codepoint(s, n, cp);
+    void accept(Visitor &v) override;
 
-    if (cp != ch_) {
-      c.set_error_pos(s);
-      return static_cast<size_t>(-1);
-    }
-    return len;
-  }
-
-  void accept(Visitor &v) override;
-
-  char32_t ch_;
+    char 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);
+    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;
     }
-    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 {
-    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;
-  }
+    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);
+    }
 
-  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) {
-    is_token_boundary = true;
-  }
+    TokenBoundary(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 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,
@@ -1671,294 +1391,293 @@ 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 &predicate_data) const;
+    std::any reduce(SemanticValues &vs, std::any &dt) 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_(std::move(name)) {}
+    BackReference(std::string &&name) : name_(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_;
+    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(char32_t dt) {
-  return std::make_shared<Character>(dt);
+inline std::shared_ptr<Ope> chr(char 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>(); }
@@ -1967,614 +1686,511 @@ 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 &) {}
-};
-
-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); }
+    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 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 TraversalVisitor {
-  using TraversalVisitor::visit;
+struct AssignIDToDefinition : public Ope::Visitor {
+    using Ope::Visitor::visit;
 
-  void visit(Holder &ope) override;
-  void visit(Reference &ope) override;
-  void visit(PrecedenceClimbing &ope) override;
+    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); }
 
-  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 (const auto &op : ope.opes_) {
-      if (!IsLiteralToken::check(*op)) { return; }
+    void visit(PrioritizedChoice &ope) override {
+        for (auto op : ope.opes_) {
+            if (!IsLiteralToken::check(*op)) { return; }
+        }
+        result_ = true;
     }
-    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 TraversalVisitor {
-  using TraversalVisitor::visit;
+struct TokenChecker : public Ope::Visitor {
+    using Ope::Visitor::visit;
 
-  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;
+    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); }
 
-  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 TraversalVisitor {
-  using TraversalVisitor::visit;
+struct DetectLeftRecursion : public Ope::Visitor {
+    using Ope::Visitor::visit;
 
-  DetectLeftRecursion(const std::string &name) : name_(name) {}
+    DetectLeftRecursion(const std::string &name) : name_(name) {}
 
-  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(Sequence &ope) override {
+        for (auto op : ope.opes_) {
+            op->accept(*this);
+            if (done_) {
+                break;
+            } else 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(PrioritizedChoice &ope) override {
+        for (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(User &) override { done_ = true; }
-  void visit(Reference &ope) override;
-  void visit(BackReference &) override { done_ = true; }
-  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(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; }
 
-  const char *error_s = nullptr;
-
-  std::shared_ptr<Ope> resolve_macro_arg(size_t iarg) const;
+    const char *error_s = nullptr;
 
 private:
-  std::string name_;
-  std::unordered_set<std::string> refs_;
-  bool done_ = false;
-  std::vector<const std::vector<std::shared_ptr<Ope>> *> macro_args_stack_;
+    std::string name_;
+    std::unordered_set<std::string> refs_;
+    bool done_ = false;
 };
 
-struct ComputeCanBeEmpty : public TraversalVisitor {
-  using TraversalVisitor::visit;
+struct HasEmptyElement : public Ope::Visitor {
+    using Ope::Visitor::visit;
 
-  bool result = false;
+    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 {
-    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 HasEmptyElement : 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) {}
-
-  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(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(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(Reference &ope) override;
+    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;
+    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 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 DetectInfiniteLoop : public TraversalVisitor {
-  using TraversalVisitor::visit;
+struct DetectInfiniteLoop : public Ope::Visitor {
+    using Ope::Visitor::visit;
 
-  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);
-  }
-
-  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; }
+    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(PrioritizedChoice &ope) override {
-    for (const 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(Reference &ope) override;
 
-  bool has_error = false;
-  const char *error_s = nullptr;
-  std::string error_name;
+    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;
 
 private:
-  std::vector<std::pair<const char *, std::string>> &refs_;
-  std::unordered_map<std::string, bool> &has_error_cache_;
+    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;
+struct ReferenceChecker : public Ope::Visitor {
+    using Ope::Visitor::visit;
 
-  ReferenceChecker(const Grammar &grammar,
-                   const std::vector<std::string> &params)
-      : grammar_(grammar), params_(params) {}
+    ReferenceChecker(const Grammar &grammar,
+                     const std::vector<std::string> &params)
+        : grammar_(grammar), params_(params) {}
 
-  void visit(Reference &ope) override;
+    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(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); }
 
-  std::unordered_map<std::string, const char *> error_s;
-  std::unordered_map<std::string, std::string> error_message;
-  std::unordered_set<std::string> referenced;
+    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_;
+    const Grammar &grammar_;
+    const std::vector<std::string> &params_;
 };
 
-struct LinkReferences : public TraversalVisitor {
-  using TraversalVisitor::visit;
+struct LinkReferences : public Ope::Visitor {
+    using Ope::Visitor::visit;
 
-  LinkReferences(Grammar &grammar, const std::vector<std::string> &params)
-      : grammar_(grammar), params_(params) {}
+    LinkReferences(Grammar &grammar, const std::vector<std::string> &params)
+        : grammar_(grammar), params_(params) {}
 
-  void visit(Reference &ope) override;
+    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(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); }
 
 private:
-  Grammar &grammar_;
-  const std::vector<std::string> &params_;
+    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 (const auto &o : ope.opes_) {
-      o->accept(*this);
-      opes.emplace_back(std::move(found_ope));
-    }
-    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));
-    }
-    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;
-
-private:
-  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(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(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)));
+    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);
     }
-    if (ope.negated_) {
-      result_.chars.flip();
-      result_.any_char = true; // negated class can match non-ASCII
+    void visit(Repetition &ope) override {
+        ope.ope_->accept(*this);
+        found_ope = rep(found_ope, ope.min_, ope.max_);
     }
-  }
-  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(AndPredicate &ope) override {
+        ope.ope_->accept(*this);
+        found_ope = apd(found_ope);
     }
-  }
-  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; }
+    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(); }
 
-  // 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_;
+    std::shared_ptr<Ope> found_ope;
 
 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;
-
-private:
-  ComputeFirstSet::FirstSetCache first_set_cache_;
-  std::unordered_set<const Definition *> visited_rules_;
+    const std::vector<std::shared_ptr<Ope>> &args_;
+    const std::vector<std::string> &params_;
 };
 
 /*
@@ -2589,299 +2205,279 @@ 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 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) 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]);
+    Definition(const Definition &rhs) : name(rhs.name), holder_(rhs.holder_) {
+        holder_->outer_ = this;
     }
-    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]);
+    Definition(const std::shared_ptr<Ope> &ope)
+        : holder_(std::make_shared<Holder>(this)) {
+        *this <= ope;
     }
-    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);
-  }
+    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) 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);
+    }
 
 #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};
 
-  Predicate predicate;
+    std::function<bool(const SemanticValues &vs, const std::any &dt,
+                       std::string &msg)>
+        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;
-  bool is_left_recursive = false;
-  bool can_be_empty = 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;
 
-  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 eoi_check = true;
-
-  // Per-rule packrat stats (optional, for profiling)
-  mutable bool collect_packrat_stats = false;
-  mutable std::vector<Context::PackratStats> packrat_stats_;
+    bool eoi_check = true;
 
 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_packrat_filter() const;
-
-  Result parse_core(const char *s, size_t n, SemanticValues &vs, std::any &dt,
-                    const char *path, Log log) 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); }
-    });
-
-    Context c(path, s, n, definition_ids_.size(), whitespaceOpe, wordOpe,
-              enablePackratParsing, tracer_enter, tracer_leave, trace_data,
-              verbose_trace, log);
-
-    if (collect_packrat_stats) {
-      packrat_stats_.resize(definition_ids_.size());
-      c.packrat_stats = &packrat_stats_;
+    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);
+        });
     }
 
-    if (enablePackratParsing) {
-      initialize_packrat_filter();
-      if (!packrat_filter_.empty()) {
-        c.packrat_rule_filter = &packrat_filter_;
-      }
-    }
+    Result parse_core(const char *s, size_t n, SemanticValues &vs, std::any &dt,
+                      const char *path, Log log) const {
+        initialize_definition_ids();
 
-    size_t i = 0;
+        std::shared_ptr<Ope> ope = holder_;
 
-    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; });
+        std::any trace_data;
+        if (tracer_start) { tracer_start(trace_data); }
+        auto se1 = scope_exit([&]() {
+            if (tracer_end) { tracer_end(trace_data); }
+        });
 
-      auto len = whitespaceOpe->parse(s, n, vs, c, dt);
-      if (fail(len)) { return Result{false, c.recovered, i, c.error_info}; }
+        Context c(path, s, n, definition_ids_.size(), whitespaceOpe, wordOpe,
+                  enablePackratParsing, tracer_enter, tracer_leave, trace_data,
+                  verbose_trace, log);
 
-      i = len;
-    }
+        size_t i = 0;
 
-    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;
+        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;
         }
-      }
-    }
-    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<bool> packrat_filter_;
+        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_;
 };
 
 /*
@@ -2891,704 +2487,592 @@ 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, const std::string &lower_lit) {
-  size_t i = 0;
-  for (; i < lit.size(); i++) {
-    if (i >= n ||
-        (ignore_case ? (static_cast<char>(std::tolower(
-                            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);
+                            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);
+        }
     }
-  }
 
-  // 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
-  auto wl = c.skip_whitespace(s + i, n - i, vs, dt);
-  if (fail(wl)) { return wl; }
-  i += wl;
+    // 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; });
 
-  return i;
+        auto len = c.whitespaceOpe->parse(s + i, n - i, vs, c, dt);
+        if (fail(len)) { return len; }
+        i += len;
+    }
+
+    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);
+    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);
 
-        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 += "'";
+                msg = replace_all(msg, "%c", unexpected_char);
             } else {
-              msg += "<" + error_rule->name + ">";
-              if (label.empty()) { label = error_rule->name; }
+                msg = message;
             }
-            first_item = false;
-          }
-
-          i++;
+            log(line.first, line.second, msg, label);
         }
-        msg += ".";
-      }
-      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);
 
-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);
+            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);
+        }
+    }
 }
 
 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) {
+        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;
+            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);
+            }
         }
-      }
-
-      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 (tracer_enter && tracer_leave) {
+        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) {
-    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)) {
+    if (i == 0) {
         c.set_error_pos(s);
-        return len;
-      }
-      i += len;
+        return static_cast<size_t>(-1);
     }
-  }
 
-  // Skip whitespace
-  auto wl = c.skip_whitespace(s + i, n - i, vs, dt);
-  if (fail(wl)) { return wl; }
-  i += wl;
+    vs.choice_count_ = trie_.size();
+    vs.choice_ = id;
 
-  return i;
+    // 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;
 }
 
 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_, lower_lit_);
+    return parse_literal(s, n, vs, c, dt, lit_, init_is_word_, is_word_,
+                         ignore_case_);
 }
 
 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 se =
-      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 se1 =
+        scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
 
-  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);
-  }
+    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);
+    }
 
-  if (success(len)) {
-    vs.tokens.emplace_back(std::string_view(s, len));
+    if (success(len)) {
+        vs.tokens.emplace_back(std::string_view(s, len));
 
-    auto wl = c.skip_whitespace(s + len, n - len, vs, dt);
-    if (fail(wl)) { return wl; }
-    len += wl;
-  }
-  return 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;
+            }
+        }
+    }
+    return len;
 }
 
 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
+    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;
+    }
 
-  size_t len;
-  std::any val;
+    size_t len;
+    std::any val;
 
-  // 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.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); }
+        });
 
-    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); }
+        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;
+            }
+        }
     });
 
-    c.rule_stack.push_back(outer_);
-    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 && !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(len)) {
+        if (!outer_->ignoreSemanticValue) {
+            vs.emplace_back(std::move(val));
+            vs.tags.emplace_back(str2tag(outer_->name));
         }
-      }
-
-      if (success(parse_len)) {
-        if (!c.recovered) { parse_val = reduce(chvs, dt, predicate_data); }
-      } 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;
-      }
     }
 
-    return std::make_pair(parse_len, std::move(parse_val));
-  };
-
-  if (outer_->is_left_recursive) {
-    auto lr_key = std::make_pair(outer_, 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(outer_);
-    } 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(outer_); }
-
-      // 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
-          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 != outer_ &&
-                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)) { 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 = std::make_pair(outer_, 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;
+    return len;
 }
 
-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 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 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_;
 }
 
 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 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);
-
-      // 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 se = scope_exit([&]() { c.pop_args(); });
-      return rule_->holder_->parse(s, n, vs, c, dt);
-    } else {
-      // 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);
+    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; });
+
+    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));
+            }
+
+            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);
+        }
+    } else {
+        // Reference parameter in macro
+        const auto &args = c.top_args();
+        return args[iarg_]->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 {
-  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);
+    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);
+        }
     }
-  }
 
-  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,
-                    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); });
+    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); });
 
-  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;
+        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));
     }
 
-    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;
+    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_);
-
-  // 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;
-    }
-  }
-
-  // Recovery
-  auto len = static_cast<size_t>(-1);
-  {
-    auto save_log = c.log;
-    c.log = nullptr;
-    auto se = scope_exit([&]() { c.log = save_log; });
-
-    SemanticValues dummy_vs;
-    std::any dummy_dt;
-
-    len = rule.parse(s, n, dummy_vs, c, dummy_dt);
-  }
-
-  if (success(len)) {
-    c.recovered = true;
+    const auto &rule = dynamic_cast<Reference &>(*ope_);
 
+    // Custom error message
     if (c.log) {
-      c.error_info.output_log(c.log, c.s, c.l);
-      c.error_info.clear();
+        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;
+        }
     }
-  }
 
-  // Cut
-  if (!c.cut_stack.empty()) {
-    c.cut_stack.back() = true;
+    // Recovery
+    auto len = static_cast<size_t>(-1);
+    {
+        auto save_log = c.log;
+        c.log = nullptr;
+        auto se = scope_exit([&]() { c.log = save_log; });
 
-    if (c.cut_stack.size() == 1) {
-      // TODO: Remove unneeded entries in packrat memoise table
+        SemanticValues dummy_vs;
+        std::any dummy_dt;
+
+        len = rule.parse(s, n, dummy_vs, c, dummy_dt);
     }
-  }
 
-  return len;
+    if (success(len)) {
+        c.recovered = true;
+
+        if (c.log) {
+            c.error_info.output_log(c.log, c.s, c.l);
+            c.error_info.clear();
+        }
+    }
+
+    // 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;
 }
 
 inline void Sequence::accept(Visitor &v) { v.visit(*this); }
@@ -3616,482 +3100,194 @@ 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 (const auto &arg : ope.args_) {
-      arg->accept(*this);
+    if (ope.rule_) {
+        for (auto arg : ope.args_) {
+            arg->accept(*this);
+        }
+        ope.rule_->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 (const auto &arg : ope.args_) {
-      arg->accept(*this);
+    if (ope.is_macro_) {
+        for (auto arg : ope.args_) {
+            arg->accept(*this);
+        }
+    } else {
+        has_rule_ = true;
     }
-  } else {
-    has_rule_ = true;
-  }
 }
 
 inline void FindLiteralToken::visit(Reference &ope) {
-  if (ope.is_macro_) {
-    ope.rule_->accept(*this);
-    for (const auto &arg : ope.args_) {
-      arg->accept(*this);
+    if (ope.is_macro_) {
+        ope.rule_->accept(*this);
+        for (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 (!ope.rule_ && !macro_args_stack_.empty()) {
-    // Macro parameter reference: resolve through nested macro arg
-    // stacks (e.g. B(X) <- C(X) where X is itself a param ref).
-    auto resolved = resolve_macro_arg(ope.iarg_);
-    if (resolved) {
-      resolved->accept(*this);
-      if (done_ == false) { return; }
+    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; }
+        }
     }
-  } else if (!refs_.count(ope.name_)) {
-    refs_.insert(ope.name_);
-    if (ope.rule_) {
-      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()) {
-    auto resolved = resolve_macro_arg(ope.iarg_);
-    if (resolved) {
-      ComputeCanBeEmpty cbe;
-      resolved->accept(cbe);
-      done_ = !cbe.result;
-    } else {
-      done_ = true;
-    }
-  } else {
-    done_ = !(ope.rule_ && ope.rule_->can_be_empty);
-  }
-}
-
-inline std::shared_ptr<Ope>
-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 nullptr; }
-    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];
-  }
-  return nullptr;
+    done_ = true;
 }
 
 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;
+    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;
         }
+
+        save_is_empty = is_empty;
+        save_error_s = error_s;
+        save_error_name = error_name;
+
+        is_empty = false;
+        error_name.clear();
         ++it;
-      }
-      return;
     }
 
-    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;
+    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 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 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; }
 
-  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 (const auto &arg : ope.args_) {
-      arg->accept(*this);
+    if (ope.is_macro_) {
+        for (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_)) {
-    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()) {
+    if (!grammar_.count(ope.name_)) {
         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 (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;
+        error_message[ope.name_] = "'" + ope.name_ + "' is not defined.";
     } 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;
+        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);
+        }
     }
-  }
-
-  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; }
-  if (!visited_rules_.insert(ope.rule_).second) { return; }
-  ope.rule_->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 reachable from an Ope subtree (bitvector indexed by
-    // def_id)
-    struct CollectReachableRules : public TraversalVisitor {
-      using TraversalVisitor::visit;
-      std::vector<bool> reachable; // indexed by def_id
-
-      CollectReachableRules(size_t n) : reachable(n, false) {}
-
-      void visit(Holder &ope) override {
-        auto id = ope.outer_->id;
-        if (id < reachable.size()) { reachable[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: reachable from 2+ alternatives of same choice
-    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) {}
-
-      void visit(PrioritizedChoice &ope) override {
-        // For each alternative, collect reachable rules as bitvectors
-        std::vector<std::vector<bool>> alt_reachable;
-        for (auto &op : ope.opes_) {
-          CollectReachableRules crr(def_count);
-          op->accept(crr);
-          alt_reachable.push_back(std::move(crr.reachable));
-        }
-
-        // Mark rules reachable from 2+ alternatives
-        for (size_t id = 0; id < def_count; id++) {
-          size_t count = 0;
-          for (auto &alt : alt_reachable) {
-            if (alt[id]) { count++; }
-          }
-          if (count >= 2) { benefits[id] = true; }
-        }
-
-        // 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); }
-
-    packrat_filter_ = std::move(benefits);
-  });
 }
 
 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 (const auto &arg : ope.args_) {
-    arg->accept(*this);
-  }
+    for (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();
 }
 
 /*-----------------------------------------------------------------------------
@@ -4102,1011 +3298,955 @@ 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,
-                             bool enable_left_recursion = true) {
-    return get_instance().perform_core(s, n, rules, log, std::string(start),
-                                       enable_left_recursion);
-  }
+    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));
+    }
 
-  // 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;
-  }
-
-  ParserGenerator() {
-    make_grammar();
-    setup_actions();
-  }
-
-  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"]);
-    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())),
-                        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["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;
+    static ParserGenerator &get_instance() {
+        static ParserGenerator instance;
+        return instance;
     }
-  }
 
-  void setup_actions() {
-    g["Definition"] = [&](const SemanticValues &vs, std::any &dt) {
-      auto &data = *std::any_cast<Data *>(dt);
+    ParserGenerator() {
+        make_grammar();
+        setup_actions();
+    }
 
-      auto is_macro = vs.choice() == 0;
-      auto ignore = std::any_cast<bool>(vs[0]);
-      auto name = std::any_cast<std::string>(vs[1]);
+    struct Instruction {
+        std::string type;
+        std::any data;
+        std::string_view sv;
+    };
 
-      std::vector<std::string> params;
-      std::shared_ptr<Ope> ope;
-      auto has_instructions = false;
+    struct Data {
+        std::shared_ptr<Grammar> grammar;
+        std::string start;
+        const char *start_pos = nullptr;
 
-      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; }
-      }
+        std::vector<std::pair<std::string, const char *>> duplicates_of_definition;
 
-      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); }
+        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>()) {}
+    };
+
+    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;
+        }
+    }
+
+    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; }
             }
-          } else {
-            data.duplicates_of_instruction.emplace_back(type,
-                                                        instruction.sv.data());
-          }
+
+            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;
         }
-      }
+        return true;
+    }
 
-      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;
+    ParserContext perform_core(const char *s, size_t n, const Rules &rules,
+                               Log log, std::string requested_start) {
+        Data data;
+        auto &grammar = *data.grammar;
 
-        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]);
+        // 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"};
+            }
         }
 
-        auto ope = ref(*data.grammar, ident, vs.sv().data(), is_macro, args);
-        if (ident == RECOVER_DEFINITION_NAME) { ope = rec(ope); }
+        std::any dt = &data;
+        auto r = g["Grammar"].parse(s, n, dt, nullptr, log);
 
-        if (ignore) {
-          return ign(ope);
-        } else {
-          return 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 {};
         }
-      }
-      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) {
-          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());
-    };
-
-    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());
-        if (cp1 > cp2) {
-          throw SyntaxErrorException("characer range is out of order...",
-                                     vs.line_info());
+        // 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;
+            }
         }
-        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>();
-    };
+        // Check duplicated definitions
+        auto ret = true;
 
-    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 (!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;
         }
-        if (!found) {
-          auto ptr = vs.token().data() - 1; // include '$' symbol
-          data.undefined_back_references.emplace_back(vs.token(), ptr);
+
+        // 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;
         }
-      }
 
-      // 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 (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);
+        // 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;
         }
-        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;
-    };
+        // Set root definition
+        auto start = data.start;
 
-    g["NoAstOpt"] = [](const SemanticValues &vs) {
-      Instruction instruction;
-      instruction.type = "no_ast_opt";
-      instruction.sv = vs.sv();
-      return instruction;
-    };
+        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;
+            }
+        }
 
-    g["Instruction"] = [](const SemanticValues &vs) {
-      return vs.transform<Instruction>();
-    };
-  }
+        if (!ret) { return {}; }
 
-  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 &start_rule = grammar[start];
 
-      auto atom_name = dynamic_cast<Reference &>(*atom).name_;
-      auto binop_name = dynamic_cast<Reference &>(*binop).name_;
-      auto atom1_name = dynamic_cast<Reference &>(*atom1).name_;
+        // 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 (!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 +
-                  "'.",
-              "");
+        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);
+        }
+
+        // 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;
         }
         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"};
-      }
     }
 
-    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;
-        }
-      }
-    }
-
-    // Setup First-Set and ISpan optimizations
-    for (auto &x : grammar) {
-      SetupFirstSets vis;
-      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;
+    Grammar g;
 };
 
 /*-----------------------------------------------------------------------------
@@ -5114,163 +4254,163 @@ 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)
+        : 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::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)
+        : 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 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),
+          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 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 (const 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 (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->position, original->length,
-                                     original->choice_count, original->choice);
-      for (auto &node : ast->nodes) {
-        node->parent = ast;
-      }
-      return ast;
+        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;
     }
 
-    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());
-    }
+        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());
+        }
 
-    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());
+        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());
 
-    for (auto &node : ast->nodes) {
-      node->parent = ast;
-    }
-    return ast;
-  };
+        for (auto node : ast->nodes) {
+            node->parent = ast;
+        }
+        return ast;
+    };
 }
 
 #define PEG_EXPAND(...) __VA_ARGS__
@@ -5410,235 +4550,229 @@ 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() const { return grammar_ != nullptr; }
+    operator bool() { 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);
-  }
-
-  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);
+    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;
     }
-    return false;
-  }
 
-  bool parse_n(const char *s, size_t n, std::any &dt,
+    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(), 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,
                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 parse_n(sv.data(), sv.size(), dt, path);
     }
-    return false;
-  }
 
-  template <typename T>
-  bool parse_n(const char *s, size_t n, T &val,
+    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 {
-    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 parse_n(sv.data(), sv.size(), dt, val, path);
     }
-    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,
-             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_left_recursion(bool enable = true) {
-    enableLeftRecursion_ = enable;
-  }
-
-  void enable_packrat_parsing() {
-    if (grammar_ != nullptr) {
-      auto &rule = (*grammar_)[start_];
-      rule.enablePackratParsing = enablePackratParsing_;
+    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); }
+    template <typename T = Ast> parser &enable_ast() {
+        for (auto &[_, rule] : *grammar_) {
+            if (!rule.action) { add_ast_action<T>(rule); }
+        }
+        return *this;
     }
-    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); };
-  }
+    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;
-  }
-
-  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); }
+    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;
     }
-    return rules;
-  }
 
-  std::shared_ptr<Grammar> grammar_;
-  std::string start_;
-  bool enableLeftRecursion_ = true;
-  bool enablePackratParsing_ = false;
-  Log log_;
+    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::shared_ptr<Grammar> grammar_;
+    std::string start_;
+    bool enablePackratParsing_ = false;
+    Log log_;
 };
 
 /*-----------------------------------------------------------------------------
@@ -5646,59 +4780,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 &) {});
 }
 
 /*-----------------------------------------------------------------------------
@@ -5706,98 +4840,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;
+    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;
     };
-    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 &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 &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);
 
-            os << "  id       total      %     success        fail  "
-                  "definition"
-               << std::endl;
+                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++;
+                }
 
-            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;
+                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;
 
-            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;
-            ;
+                    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;
+                    }
 
-            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++;
+                    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++;
+                    }
+                }
             }
-          }
-        }
-      },
-      [&](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/qt_utils.h b/libcockatrice_utility/libcockatrice/utility/qt_utils.h
index 334e56027..606947143 100644
--- a/libcockatrice_utility/libcockatrice/utility/qt_utils.h
+++ b/libcockatrice_utility/libcockatrice/utility/qt_utils.h
@@ -18,17 +18,14 @@ template <typename T> T *findParentOfType(const QObject *obj)
 
 static inline void clearLayoutRec(QLayout *l)
 {
-    if (!l) {
+    if (!l)
         return;
-    }
     QLayoutItem *it;
     while ((it = l->takeAt(0)) != nullptr) {
-        if (QWidget *w = it->widget()) {
+        if (QWidget *w = it->widget())
             w->deleteLater();
-        }
-        if (QLayout *sub = it->layout()) {
+        if (QLayout *sub = it->layout())
             clearLayoutRec(sub);
-        }
         delete it;
     }
 }
diff --git a/libcockatrice_utility/libcockatrice/utility/trice_limits.h b/libcockatrice_utility/libcockatrice/utility/trice_limits.h
index 833ce1b98..fa7ce7489 100644
--- a/libcockatrice_utility/libcockatrice/utility/trice_limits.h
+++ b/libcockatrice_utility/libcockatrice/utility/trice_limits.h
@@ -15,12 +15,6 @@ constexpr uint MAXIMUM_DIE_SIDES = 1000000;
 constexpr uint MINIMUM_DICE_TO_ROLL = 1;
 constexpr uint MAXIMUM_DICE_TO_ROLL = 100;
 
-// Card counter value bounds [0, MAX_COUNTERS_ON_CARD].
-// Counters on cards (e.g., +1/+1 counters, charge counters) are non-negative physical game objects.
-// The max of 999 is a display constraint (3-digit rendering) and reasonable gameplay limit.
-// Server enforces these bounds; client may also check for UX optimization.
-constexpr int MAX_COUNTERS_ON_CARD = 999;
-
 // optimized functions to get qstrings that are at most that long
 static inline QString nameFromStdString(const std::string &_string)
 {
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index a51982625..3bb4de5df 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -28,7 +28,6 @@ set(oracle_SOURCES
     ../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/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
diff --git a/oracle/oracle_en@source.ts b/oracle/oracle_en@source.ts
index 943b44a97..53ad27b4d 100644
--- a/oracle/oracle_en@source.ts
+++ b/oracle/oracle_en@source.ts
@@ -278,7 +278,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation type="unfinished"></translation>
     </message>
@@ -286,7 +286,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index bace63508..d585842f6 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -124,11 +124,10 @@ static void sortAndReduceColors(QString &colors)
     // reduce
     QChar lastChar = '\0';
     for (int i = 0; i < colors.size(); ++i) {
-        if (colors.at(i) == lastChar) {
+        if (colors.at(i) == lastChar)
             colors.remove(i, 1);
-        } else {
+        else
             lastChar = colors.at(i);
-        }
     }
 }
 
@@ -192,13 +191,12 @@ CardInfoPtr OracleImporter::addCard(QString name,
     // table row
     int tableRow = 1;
     QString mainCardType = properties.value("maintype").toString();
-    if (mainCardType == "Land") {
+    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";
@@ -284,9 +282,8 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
             QString mtgjsonProperty = i.key();
             QString xmlPropertyName = i.value();
             QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty);
-            if (!propertyValue.isEmpty()) {
+            if (!propertyValue.isEmpty())
                 properties.insert(xmlPropertyName, propertyValue);
-            }
         }
 
         // per-set properties
@@ -295,9 +292,8 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
             QString mtgjsonProperty = i.key();
             QString xmlPropertyName = i.value();
             QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty);
-            if (!propertyValue.isEmpty()) {
+            if (!propertyValue.isEmpty())
                 printingInfo.setProperty(xmlPropertyName, propertyValue);
-            }
         }
 
         // handle flavorNames specially due to double-faced cards
@@ -364,12 +360,14 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
         }
 
         // split cards are considered a single card, enqueue for later merging
-        if (layout == "split" || layout == "aftermath" || layout == "adventure" || layout == "prepare") {
+        if (layout == "split" || layout == "aftermath" || layout == "adventure") {
             auto _faceName = getStringPropertyFromMap(card, "faceName");
             SplitCardPart split(_faceName, text, properties, printingInfo);
             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);
             }
@@ -473,8 +471,8 @@ FormatRulesNameMap OracleImporter::createDefaultMagicFormats()
     // Predefined common exceptions
     CardCondition superTypeIsBasic;
     superTypeIsBasic.field = "type";
-    superTypeIsBasic.matchType = "regex";
-    superTypeIsBasic.value = "\bBasic\b[^—]+\bLand\b";
+    superTypeIsBasic.matchType = "contains";
+    superTypeIsBasic.value = "Basic Land";
 
     ExceptionRule basicLands;
     basicLands.conditions.append(superTypeIsBasic);
@@ -548,9 +546,8 @@ int OracleImporter::startImport()
         CardSetPtr newSet = CardSet::newInstance(noOpController, curSetToParse.getShortName(),
                                                  curSetToParse.getLongName(), curSetToParse.getSetType(),
                                                  curSetToParse.getReleaseDate(), curSetToParse.getPriority());
-        if (!sets.contains(newSet->getShortName())) {
+        if (!sets.contains(newSet->getShortName()))
             sets.insert(newSet->getShortName(), newSet);
-        }
 
         int numCardsInSet = importCardsFromSet(newSet, curSetToParse.getCards());
 
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index 5bf352594..e83958d73 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -22,7 +22,6 @@ 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},
diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp
index 2edb9e561..9d32a993b 100644
--- a/oracle/src/oraclewizard.cpp
+++ b/oracle/src/oraclewizard.cpp
@@ -21,10 +21,6 @@ OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
     // define a dummy context that will be used where needed
     QString dummy = QT_TRANSLATE_NOOP("i18n", "English");
 
-#ifdef Q_OS_WIN
-    setWizardStyle(QWizard::ModernStyle);
-#endif
-
     QString oracleSettingsFile = SettingsCache::instance().getSettingsPath() + "oracle.ini";
     settings = new QSettings(oracleSettingsFile, QSettings::IniFormat, this);
 
diff --git a/oracle/src/pagetemplates.h b/oracle/src/pagetemplates.h
index 6e79c867e..79dcdd632 100644
--- a/oracle/src/pagetemplates.h
+++ b/oracle/src/pagetemplates.h
@@ -27,7 +27,7 @@ protected:
     inline OracleWizard *wizard()
     {
         return (OracleWizard *)QWizardPage::wizard();
-    }
+    };
 };
 
 class SimpleDownloadFilePage : public OracleWizardPage
diff --git a/oracle/translations/oracle_de.ts b/oracle/translations/oracle_de.ts
index df12f40f4..bdf344048 100644
--- a/oracle/translations/oracle_de.ts
+++ b/oracle/translations/oracle_de.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Platzhalter Edition mit Spielsteinen</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Oracle Importer</translation>
     </message>
diff --git a/oracle/translations/oracle_el.ts b/oracle/translations/oracle_el.ts
index 7934997cf..73260a16d 100644
--- a/oracle/translations/oracle_el.ts
+++ b/oracle/translations/oracle_el.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Εικονικό σετ που περιέχει tokens</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Εισαγωγέας Oracle</translation>
     </message>
diff --git a/oracle/translations/oracle_en_US.ts b/oracle/translations/oracle_en_US.ts
index 4b664bf57..348b26323 100644
--- a/oracle/translations/oracle_en_US.ts
+++ b/oracle/translations/oracle_en_US.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Dummy set containing tokens</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Oracle Importer</translation>
     </message>
diff --git a/oracle/translations/oracle_es.ts b/oracle/translations/oracle_es.ts
index eeb9f71bd..b50501505 100644
--- a/oracle/translations/oracle_es.ts
+++ b/oracle/translations/oracle_es.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Set dedicado para tokens</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Importador de Oracle</translation>
     </message>
diff --git a/oracle/translations/oracle_et.ts b/oracle/translations/oracle_et.ts
index 9f2c560cd..a68d71de5 100644
--- a/oracle/translations/oracle_et.ts
+++ b/oracle/translations/oracle_et.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Nukk-komplekt mis sisaldab märgistusi</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Oracle sissetooja</translation>
     </message>
diff --git a/oracle/translations/oracle_fi.ts b/oracle/translations/oracle_fi.ts
index c7657cf7a..d32263f7e 100644
--- a/oracle/translations/oracle_fi.ts
+++ b/oracle/translations/oracle_fi.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Tokeneja sisältävä mallisetti</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Oracle-lataaja</translation>
     </message>
diff --git a/oracle/translations/oracle_fr.ts b/oracle/translations/oracle_fr.ts
index 47ab5d0fa..d43dfa9f3 100644
--- a/oracle/translations/oracle_fr.ts
+++ b/oracle/translations/oracle_fr.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Fausse édition contenant les jetons</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Importateur Oracle</translation>
     </message>
diff --git a/oracle/translations/oracle_it.ts b/oracle/translations/oracle_it.ts
index 34bcb3cbc..bea5af275 100644
--- a/oracle/translations/oracle_it.ts
+++ b/oracle/translations/oracle_it.ts
@@ -277,7 +277,7 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Set finto contenente i token</translation>
     </message>
@@ -285,7 +285,7 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Oracle Importer</translation>
     </message>
diff --git a/oracle/translations/oracle_ja.ts b/oracle/translations/oracle_ja.ts
index 8319f37a2..8d15cec34 100644
--- a/oracle/translations/oracle_ja.ts
+++ b/oracle/translations/oracle_ja.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>ダミーセットを含むトークン</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Oracle Importer - オラクル・インポーター</translation>
     </message>
diff --git a/oracle/translations/oracle_ko.ts b/oracle/translations/oracle_ko.ts
index c5c24583f..f69ad2fab 100644
--- a/oracle/translations/oracle_ko.ts
+++ b/oracle/translations/oracle_ko.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>토큰 정보가 들어있는 더미 확장판</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>오라클</translation>
     </message>
diff --git a/oracle/translations/oracle_nb.ts b/oracle/translations/oracle_nb.ts
index b40868cc1..191e156ef 100644
--- a/oracle/translations/oracle_nb.ts
+++ b/oracle/translations/oracle_nb.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Dummy sett som inneholder tokens</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Oracle importerer</translation>
     </message>
diff --git a/oracle/translations/oracle_nl.ts b/oracle/translations/oracle_nl.ts
index ed9a5fae9..18ca92dc2 100644
--- a/oracle/translations/oracle_nl.ts
+++ b/oracle/translations/oracle_nl.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Token voorbeeldset</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Oracle importer</translation>
     </message>
diff --git a/oracle/translations/oracle_pl.ts b/oracle/translations/oracle_pl.ts
index d5d632f70..643bb6669 100644
--- a/oracle/translations/oracle_pl.ts
+++ b/oracle/translations/oracle_pl.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Dodatek-atrapa, zawierający tokeny.</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Oracle – kreator importu</translation>
     </message>
diff --git a/oracle/translations/oracle_pt.ts b/oracle/translations/oracle_pt.ts
index c578a0365..309696e8c 100644
--- a/oracle/translations/oracle_pt.ts
+++ b/oracle/translations/oracle_pt.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Set básico contendo fichas</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Importar Oracle</translation>
     </message>
diff --git a/oracle/translations/oracle_pt_BR.ts b/oracle/translations/oracle_pt_BR.ts
index 96a6382ec..b72de5c27 100644
--- a/oracle/translations/oracle_pt_BR.ts
+++ b/oracle/translations/oracle_pt_BR.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Esta expansão contém fichas.</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Importador Oracle</translation>
     </message>
diff --git a/oracle/translations/oracle_ru.ts b/oracle/translations/oracle_ru.ts
index e2ff5b5a0..2029ee7e9 100644
--- a/oracle/translations/oracle_ru.ts
+++ b/oracle/translations/oracle_ru.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>Пример сета с фишками</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Импортер Oracle</translation>
     </message>
diff --git a/oracle/translations/oracle_sr.ts b/oracle/translations/oracle_sr.ts
index 04d48688a..de8122316 100644
--- a/oracle/translations/oracle_sr.ts
+++ b/oracle/translations/oracle_sr.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation type="unfinished"/>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation type="unfinished"/>
     </message>
diff --git a/oracle/translations/oracle_tr.ts b/oracle/translations/oracle_tr.ts
index 517f9248e..345de6f46 100644
--- a/oracle/translations/oracle_tr.ts
+++ b/oracle/translations/oracle_tr.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation type="unfinished"/>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation type="unfinished"/>
     </message>
diff --git a/oracle/translations/oracle_yue.ts b/oracle/translations/oracle_yue.ts
index 13a621b9e..173ba8075 100644
--- a/oracle/translations/oracle_yue.ts
+++ b/oracle/translations/oracle_yue.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>包含衍生物的虚拟牌組</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Oracle導入器</translation>
     </message>
diff --git a/oracle/translations/oracle_zh-Hans.ts b/oracle/translations/oracle_zh-Hans.ts
index ff19ab463..d3927fff8 100644
--- a/oracle/translations/oracle_zh-Hans.ts
+++ b/oracle/translations/oracle_zh-Hans.ts
@@ -276,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="541"/>
         <source>Dummy set containing tokens</source>
         <translation>包含衍生物的虚拟牌组</translation>
     </message>
@@ -284,7 +284,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="70"/>
         <source>Oracle Importer</source>
         <translation>Oracle导入器</translation>
     </message>
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index b0ee201bf..bcf71a98a 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -3,7 +3,6 @@
 #include "main.h"
 #include "server_logger.h"
 
-#include <QLoggingCategory>
 #include <QSslSocket>
 #include <google/protobuf/descriptor.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
@@ -22,8 +21,6 @@
 #include <server_protocolhandler.h>
 #include <server_room.h>
 
-inline Q_LOGGING_CATEGORY(IslInterfaceLog, "isl_interface");
-
 void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privateKey)
 {
     socket = new QSslSocket(this);
@@ -76,9 +73,8 @@ 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();
     }
@@ -88,9 +84,8 @@ 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();
 }
@@ -103,12 +98,11 @@ 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()));
@@ -119,18 +113,17 @@ void IslInterface::initServer()
     socket->startServerEncryption();
     if (!socket->waitForEncrypted(5000)) {
         QList<QSslError> sslErrors(socket->sslHandshakeErrors());
-        if (sslErrors.isEmpty()) {
-            qCDebug(IslInterfaceLog) << "SSL handshake timeout, terminating connection";
-        } else {
-            qCWarning(IslInterfaceLog) << "SSL errors:" << sslErrors;
-        }
+        if (sslErrors.isEmpty())
+            qDebug() << "[ISL] SSL handshake timeout, terminating connection";
+        else
+            qDebug() << "[ISL] 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;
@@ -142,9 +135,8 @@ 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();
@@ -165,7 +157,7 @@ void IslInterface::initServer()
 
     server->islLock.lockForWrite();
     if (server->islConnectionExists(serverId)) {
-        qCDebug(IslInterfaceLog) << "Duplicate connection to #" << serverId << "terminating connection";
+        qDebug() << "[ISL] Duplicate connection to #" << serverId << "terminating connection";
         deleteLater();
     } else {
         transmitMessage(message);
@@ -188,28 +180,27 @@ void IslInterface::initClient()
     expectedErrors.append(QSslError(QSslError::SelfSignedCertificate, peerCert));
     socket->ignoreSslErrors(expectedErrors);
 
-    qCDebug(IslInterfaceLog) << "Connecting to #" << serverId << ":" << peerAddress << ":" << peerPort;
+    qDebug() << "[ISL] Connecting to #" << serverId << ":" << peerAddress << ":" << peerPort;
 
     socket->connectToHostEncrypted(peerAddress, peerPort, peerHostName);
     if (!socket->waitForConnected(5000)) {
-        qCDebug(IslInterfaceLog) << "Socket error:" << socket->errorString();
+        qDebug() << "[ISL] Socket error:" << socket->errorString();
         deleteLater();
         return;
     }
     if (!socket->waitForEncrypted(5000)) {
         QList<QSslError> sslErrors(socket->sslHandshakeErrors());
-        if (sslErrors.isEmpty()) {
-            qCDebug(IslInterfaceLog) << "SSL handshake timeout, terminating connection";
-        } else {
-            qCWarning(IslInterfaceLog) << "SSL errors:" << sslErrors;
-        }
+        if (sslErrors.isEmpty())
+            qDebug() << "[ISL] SSL handshake timeout, terminating connection";
+        else
+            qDebug() << "[ISL] SSL errors:" << sslErrors;
         deleteLater();
         return;
     }
 
     server->islLock.lockForWrite();
     if (server->islConnectionExists(serverId)) {
-        qCDebug(IslInterfaceLog) << "Duplicate connection to #" << serverId << "terminating connection";
+        qDebug() << "[ISL] Duplicate connection to #" << serverId << "terminating connection";
         deleteLater();
         return;
     }
@@ -221,9 +212,8 @@ 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();
@@ -245,30 +235,24 @@ void IslInterface::readClient()
                                 ((quint32)(unsigned char)inputBuffer[3]);
                 inputBuffer.remove(0, 4);
                 messageInProgress = true;
-            } else {
+            } else
                 return;
-            }
         }
-        if (inputBuffer.size() < messageLength) {
+        if (inputBuffer.size() < messageLength)
             return;
-        }
 
         IslMessage newMessage;
-        bool ok = newMessage.ParseFromArray(inputBuffer.data(), messageLength);
+        newMessage.ParseFromArray(inputBuffer.data(), messageLength);
         inputBuffer.remove(0, messageLength);
         messageInProgress = false;
 
-        if (ok) {
-            processMessage(newMessage);
-        } else {
-            qCWarning(IslInterfaceLog) << "parsing error!";
-        }
+        processMessage(newMessage);
     } while (!inputBuffer.isEmpty());
 }
 
 void IslInterface::catchSocketError(QAbstractSocket::SocketError socketError)
 {
-    qCWarning(IslInterfaceLog) << "Socket error:" << socketError;
+    qDebug() << "[ISL] Socket error:" << socketError;
 
     server->islLock.lockForWrite();
     server->removeIslInterface(serverId);
@@ -286,10 +270,7 @@ void IslInterface::transmitMessage(const IslMessage &item)
     unsigned int size = static_cast<unsigned int>(item.ByteSize());
 #endif
     buf.resize(size + 4);
-    if (!item.SerializeToArray(buf.data() + 4, size)) {
-        qCWarning(IslInterfaceLog) << "transmit error!";
-        return;
-    }
+    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);
@@ -387,7 +368,7 @@ void IslInterface::processSessionEvent(const SessionEvent &event, qint64 session
             QReadLocker clientsLocker(&server->clientsLock);
             Server_AbstractUserInterface *client = server->getUsersBySessionId().value(sessionId);
             if (!client) {
-                qCDebug(IslInterfaceLog) << "IslInterface::processSessionEvent: session id" << sessionId << "not found";
+                qDebug() << "IslInterface::processSessionEvent: session id" << sessionId << "not found";
                 break;
             }
             const Event_GameJoined &gameJoined = event.GetExtension(Event_GameJoined::ext);
@@ -401,8 +382,7 @@ void IslInterface::processSessionEvent(const SessionEvent &event, qint64 session
             QReadLocker clientsLocker(&server->clientsLock);
             Server_AbstractUserInterface *client = server->getUsersBySessionId().value(sessionId);
             if (!client) {
-                qCWarning(IslInterfaceLog)
-                    << "IslInterface::processSessionEvent: session id" << sessionId << "not found";
+                qDebug() << "IslInterface::processSessionEvent: session id" << sessionId << "not found";
                 break;
             }
 
@@ -450,7 +430,7 @@ void IslInterface::processRoomCommand(const CommandContainer &cont, qint64 sessi
 
 void IslInterface::processMessage(const IslMessage &item)
 {
-    qCDebug(IslInterfaceLog) << getSafeDebugString(item);
+    qDebug() << getSafeDebugString(item);
 
     switch (item.message_type()) {
         case IslMessage::ROOM_COMMAND_CONTAINER: {
diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp
index 9e7fe38d9..b1294a04c 100644
--- a/servatrice/src/main.cpp
+++ b/servatrice/src/main.cpp
@@ -69,22 +69,19 @@ 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;
 }
 
@@ -93,9 +90,8 @@ 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;
 }
@@ -161,11 +157,10 @@ 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();
 
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index aa50e068a..410bf4ed9 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -318,9 +318,8 @@ 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()),
@@ -363,25 +362,21 @@ 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,11 +401,10 @@ 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;
@@ -435,9 +429,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;
         }
@@ -451,9 +445,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;
         }
@@ -461,12 +455,11 @@ 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());
@@ -518,11 +511,9 @@ 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;
 }
@@ -531,24 +522,21 @@ 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();
 
@@ -560,12 +548,10 @@ 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)
@@ -574,20 +560,18 @@ void Servatrice::setRequiredFeatures(const QString &featureList)
     serverRequiredFeatureList.clear();
     features.initalizeFeatureList(serverRequiredFeatureList);
     QStringList listReqFeatures = featureList.split(",", Qt::SkipEmptyParts);
-    if (!listReqFeatures.isEmpty()) {
+    if (!listReqFeatures.isEmpty())
         for (const QString &reqFeature : listReqFeatures) {
             features.enableRequiredFeature(serverRequiredFeatureList, reqFeature);
         }
-    }
 
     qDebug() << "Set required client features to:" << serverRequiredFeatureList;
 }
 
 void Servatrice::statusUpdate()
 {
-    if (!servatriceDatabaseInterface->checkSql()) {
+    if (!servatriceDatabaseInterface->checkSql())
         return;
-    }
 
     const int uc = getUsersCount(); // for correct mutex locking order
 
@@ -627,9 +611,8 @@ 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");
@@ -650,9 +633,8 @@ void Servatrice::statusUpdate()
             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)) {
+            if (!servatriceDatabaseInterface->execSqlQuery(forgotPwQuery))
                 return;
-            }
 
             QSqlQuery *queryDelete = servatriceDatabaseInterface->prepareQuery(
                 "update {prefix}_forgot_password set emailed = 1 where name = :name");
@@ -704,9 +686,8 @@ void Servatrice::shutdownTimeout()
 {
     // 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) {
@@ -721,9 +702,8 @@ void Servatrice::shutdownTimeout()
         }
 
         clientsLock.lockForRead();
-        for (auto &client : clients) {
+        for (auto &client : clients)
             client->sendProtocolItem(*se);
-        }
         clientsLock.unlock();
         delete se;
 
@@ -779,14 +759,12 @@ 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);
-        }
     }
 }
 
@@ -990,11 +968,10 @@ 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
@@ -1010,11 +987,10 @@ 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_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp
index 73643825e..fa9b14f31 100644
--- a/servatrice/src/servatrice_database_interface.cpp
+++ b/servatrice/src/servatrice_database_interface.cpp
@@ -7,15 +7,12 @@
 #include <QChar>
 #include <QDateTime>
 #include <QDebug>
-#include <QLoggingCategory>
 #include <QSqlError>
 #include <QSqlQuery>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/utility/passwordhasher.h>
 
-inline Q_LOGGING_CATEGORY(DatabaseInterfaceLog, "database_interface");
-
 Servatrice_DatabaseInterface::Servatrice_DatabaseInterface(int _instanceId, Servatrice *_server)
     : instanceId(_instanceId), sqlDatabase(QSqlDatabase()), server(_server)
 {
@@ -55,21 +52,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);
-    qCDebug(DatabaseInterfaceLog).noquote() << poolStr << "Opening database...";
+    qDebug().noquote() << QString("[%1] Opening database...").arg(poolStr);
     if (!sqlDatabase.open()) {
-        qCCritical(DatabaseInterfaceLog) << poolStr << "Error opening database:" << sqlDatabase.lastError().text();
+        qCritical() << QString("[%1] Error opening database: %2").arg(poolStr).arg(sqlDatabase.lastError().text());
         return false;
     }
 
     QSqlQuery *versionQuery = prepareQuery("select version from {prefix}_schema_version limit 1");
     if (!execSqlQuery(versionQuery)) {
-        qCCritical(DatabaseInterfaceLog) << poolStr << "Error opening database: unable to load database schema version"
-                                         << "(hint: ensure the cockatrice_schema_version exists)";
+        qCritical() << QString("[%1] Error opening database: unable to load database schema version (hint: ensure the "
+                               "cockatrice_schema_version exists)")
+                           .arg(poolStr);
         return false;
     }
 
@@ -77,21 +74,24 @@ bool Servatrice_DatabaseInterface::openDatabase()
         const int dbversion = versionQuery->value(0).toInt();
         const int expectedversion = DATABASE_SCHEMA_VERSION;
         if (dbversion < 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;
+            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);
             return false;
         } else if (dbversion > expectedversion) {
-            qCCritical(DatabaseInterfaceLog) << poolStr << "Error opening database: the database schema version"
-                                             << dbversion << "is too new, you need to update servatrice"
-                                             << "(this servatrice actually uses version" << 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);
             return false;
         }
     } else {
-        qCCritical(DatabaseInterfaceLog) << poolStr
-                                         << "Error opening database: unable to load database schema version (hint: "
-                                            "ensure the cockatrice_schema_version contains a single record)";
+        qCritical() << QString("[%1] Error opening database: unable to load database schema version (hint: ensure the "
+                               "cockatrice_schema_version contains a single record)")
+                           .arg(poolStr);
         return false;
     }
 
@@ -114,7 +114,9 @@ bool Servatrice_DatabaseInterface::checkSql()
 
     if (query.lastError().isValid()) {
         const auto &poolStr = instanceId == -1 ? QString("main") : QString("pool %1").arg(instanceId);
-        qCCritical(DatabaseInterfaceLog) << poolStr << "Error executing query:" << query.lastError().text();
+        qCritical() << QString("[%1] Error executing query: %2, resetting connection")
+                           .arg(poolStr)
+                           .arg(query.lastError().text());
 
         sqlDatabase.close();
         return openDatabase();
@@ -140,11 +142,10 @@ 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);
-    qCCritical(DatabaseInterfaceLog) << poolStr << "Error executing query:" << query->lastError().text();
+    qCritical() << QString("[%1] Error executing query: %2").arg(poolStr).arg(query->lastError().text());
     sqlDatabase.close();
     openDatabase();
     return false;
@@ -153,9 +154,8 @@ 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();
@@ -187,36 +187,29 @@ 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");
 
@@ -232,9 +225,8 @@ bool Servatrice_DatabaseInterface::registerUser(const QString &userName,
                                                 const QString &country,
                                                 bool active)
 {
-    if (!checkSql()) {
+    if (!checkSql())
         return false;
-    }
 
     QString passwordSha512;
     if (passwordNeedsHash) {
@@ -260,8 +252,7 @@ bool Servatrice_DatabaseInterface::registerUser(const QString &userName,
     query->bindValue(":token", token);
 
     if (!execSqlQuery(query)) {
-        qCWarning(DatabaseInterfaceLog) << "Failed to insert user: " << query->lastError()
-                                        << " sql: " << query->lastQuery();
+        qDebug() << "Failed to insert user: " << query->lastError() << " sql: " << query->lastQuery();
         return false;
     }
 
@@ -270,9 +261,8 @@ 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");
@@ -280,8 +270,8 @@ bool Servatrice_DatabaseInterface::activateUser(const QString &userName, const Q
     activateQuery->bindValue(":username", userName);
     activateQuery->bindValue(":token", token);
     if (!execSqlQuery(activateQuery)) {
-        qCWarning(DatabaseInterfaceLog) << "Account activation failed: SQL error." << activateQuery->lastError()
-                                        << " sql: " << activateQuery->lastQuery();
+        qDebug() << "Account activation failed: SQL error." << activateQuery->lastError()
+                 << " sql: " << activateQuery->lastQuery();
         return false;
     }
 
@@ -294,8 +284,7 @@ bool Servatrice_DatabaseInterface::activateUser(const QString &userName, const Q
             query->bindValue(":userName", userName);
 
             if (!execSqlQuery(query)) {
-                qCWarning(DatabaseInterfaceLog)
-                    << "Failed to activate user: " << query->lastError() << " sql: " << query->lastQuery();
+                qDebug() << "Failed to activate user: " << query->lastError() << " sql: " << query->lastQuery();
                 return false;
             }
 
@@ -318,30 +307,26 @@ 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");
             passwordQuery->bindValue(":name", user);
             if (!execSqlQuery(passwordQuery)) {
-                qCWarning(DatabaseInterfaceLog) << "Login denied: SQL error";
+                qDebug("Login denied: SQL error");
                 return NotLoggedIn;
             }
 
@@ -349,7 +334,7 @@ AuthenticationResult Servatrice_DatabaseInterface::checkUserPassword(Server_Prot
                 const QString correctPasswordSha512 = passwordQuery->value(0).toString();
                 const bool userIsActive = passwordQuery->value(1).toBool();
                 if (!userIsActive) {
-                    qCWarning(DatabaseInterfaceLog) << "Login denied: user not active";
+                    qDebug("Login denied: user not active");
                     return UserIsInactive;
                 }
                 QString hashedPassword;
@@ -359,14 +344,14 @@ AuthenticationResult Servatrice_DatabaseInterface::checkUserPassword(Server_Prot
                     hashedPassword = password;
                 }
                 if (correctPasswordSha512 == hashedPassword) {
-                    qCDebug(DatabaseInterfaceLog) << "Login accepted: password right";
+                    qDebug("Login accepted: password right");
                     return PasswordRight;
                 } else {
-                    qCDebug(DatabaseInterfaceLog) << "Login denied: password wrong";
+                    qDebug("Login denied: password wrong");
                     return NotLoggedIn;
                 }
             } else {
-                qCDebug(DatabaseInterfaceLog) << "Login accepted: unknown user";
+                qDebug("Login accepted: unknown user");
                 return UnknownUser;
             }
         }
@@ -380,12 +365,11 @@ 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()) {
-        qCWarning(DatabaseInterfaceLog) << "Failed to check if user is banned. Database invalid.";
+        qDebug("Failed to check if user is banned. Database invalid.");
         return false;
     }
 
@@ -398,9 +382,8 @@ bool Servatrice_DatabaseInterface::checkUserIsIdBanned(const QString &clientId,
                                                        QString &banReason,
                                                        int &banSecondsRemaining)
 {
-    if (clientId.isEmpty()) {
+    if (clientId.isEmpty())
         return false;
-    }
 
     QSqlQuery *idBanQuery =
         prepareQuery("select"
@@ -417,7 +400,7 @@ bool Servatrice_DatabaseInterface::checkUserIsIdBanned(const QString &clientId,
     idBanQuery->bindValue(":id", clientId);
     idBanQuery->bindValue(":id2", clientId);
     if (!execSqlQuery(idBanQuery)) {
-        qCWarning(DatabaseInterfaceLog) << "Id ban check failed: SQL error." << idBanQuery->lastError();
+        qDebug() << "Id ban check failed: SQL error." << idBanQuery->lastError();
         return false;
     }
 
@@ -427,7 +410,7 @@ bool Servatrice_DatabaseInterface::checkUserIsIdBanned(const QString &clientId,
         if ((secondsLeft > 0) || permanentBan) {
             banReason = idBanQuery->value(2).toString();
             banSecondsRemaining = permanentBan ? 0 : secondsLeft;
-            qCDebug(DatabaseInterfaceLog) << "User is banned by client id" << clientId;
+            qDebug() << "User is banned by client id" << clientId;
             return true;
         }
     }
@@ -445,7 +428,7 @@ bool Servatrice_DatabaseInterface::checkUserIsNameBanned(const QString &userName
     nameBanQuery->bindValue(":name1", userName);
     nameBanQuery->bindValue(":name2", userName);
     if (!execSqlQuery(nameBanQuery)) {
-        qCWarning(DatabaseInterfaceLog) << "Name ban check failed: SQL error" << nameBanQuery->lastError();
+        qDebug() << "Name ban check failed: SQL error" << nameBanQuery->lastError();
         return false;
     }
 
@@ -455,7 +438,7 @@ bool Servatrice_DatabaseInterface::checkUserIsNameBanned(const QString &userName
         if ((secondsLeft > 0) || permanentBan) {
             banReason = nameBanQuery->value(2).toString();
             banSecondsRemaining = permanentBan ? 0 : secondsLeft;
-            qCDebug(DatabaseInterfaceLog) << "Username" << userName << "is banned by name";
+            qDebug() << "Username" << userName << "is banned by name";
             return true;
         }
     }
@@ -481,7 +464,7 @@ bool Servatrice_DatabaseInterface::checkUserIsIpBanned(const QString &ipAddress,
     ipBanQuery->bindValue(":address", ipAddress);
     ipBanQuery->bindValue(":address2", ipAddress);
     if (!execSqlQuery(ipBanQuery)) {
-        qCWarning(DatabaseInterfaceLog) << "IP ban check failed: SQL error." << ipBanQuery->lastError();
+        qDebug() << "IP ban check failed: SQL error." << ipBanQuery->lastError();
         return false;
     }
 
@@ -491,7 +474,7 @@ bool Servatrice_DatabaseInterface::checkUserIsIpBanned(const QString &ipAddress,
         if ((secondsLeft > 0) || permanentBan) {
             banReason = ipBanQuery->value(2).toString();
             banSecondsRemaining = permanentBan ? 0 : secondsLeft;
-            qCDebug(DatabaseInterfaceLog) << "User is banned by address" << ipAddress;
+            qDebug() << "User is banned by address" << ipAddress;
             return true;
         }
     }
@@ -505,9 +488,8 @@ 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;
@@ -520,9 +502,8 @@ 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;
@@ -555,12 +536,10 @@ 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;
@@ -568,13 +547,11 @@ 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);
@@ -583,21 +560,18 @@ 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);
@@ -606,9 +580,8 @@ 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();
 }
 
@@ -616,34 +589,29 @@ 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;
-    }
 
     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();
@@ -656,14 +624,12 @@ 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()) {
@@ -673,14 +639,12 @@ 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());
-        }
     }
     return result;
 }
@@ -692,27 +656,23 @@ 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 "
                                         "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()
@@ -756,13 +716,11 @@ 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(), "
@@ -772,21 +730,18 @@ 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);
@@ -805,9 +760,8 @@ 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);
@@ -829,9 +783,8 @@ 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);
@@ -843,13 +796,11 @@ 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())");
 
@@ -862,9 +813,8 @@ 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)");
 
@@ -882,13 +832,11 @@ 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);
@@ -901,9 +849,8 @@ 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()));
@@ -918,17 +865,12 @@ void Servatrice_DatabaseInterface::storeGameInformation(const QString &roomName,
         const unsigned int size = static_cast<unsigned int>(replayList[i]->ByteSize());
 #endif
         blob.resize(size);
-        qulonglong replayId = replayList[i]->replay_id();
-        if (replayList[i]->SerializeToArray(blob.data(), size)) {
+        replayList[i]->SerializeToArray(blob.data(), size);
 
-            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();
-        }
+        replayIds.append(QVariant((qulonglong)replayList[i]->replay_id()));
+        replayGameIds.append(gameInfo.game_id());
+        replayDurations.append(replayList[i]->duration_seconds());
+        replayBlobs.append(blob);
     }
 
     {
@@ -942,9 +884,8 @@ 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 =
@@ -981,9 +922,8 @@ 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());
@@ -1002,27 +942,23 @@ 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:
@@ -1055,9 +991,8 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user,
                                             "passwordLastChangedDate = NOW() where name = :name");
     passwordQuery->bindValue(":password", passwordSha512);
     passwordQuery->bindValue(":name", user);
-    if (execSqlQuery(passwordQuery)) {
+    if (execSqlQuery(passwordQuery))
         return true;
-    }
 
     return false;
 }
@@ -1068,30 +1003,26 @@ 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)) {
-        qCWarning(DatabaseInterfaceLog) << "Change password denied: SQL error";
+        qDebug("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;
@@ -1099,9 +1030,8 @@ 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);
 }
@@ -1110,28 +1040,23 @@ 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;
 }
@@ -1139,9 +1064,8 @@ 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);
@@ -1152,16 +1076,15 @@ 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)) {
-        qCWarning(DatabaseInterfaceLog) << "Failed to locate user id when updating users last login data: SQL Error";
+        qDebug("Failed to locate user id when updating users last login data: SQL Error");
         return;
     }
 
@@ -1173,9 +1096,8 @@ 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();
@@ -1202,9 +1124,8 @@ 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 "
@@ -1212,7 +1133,7 @@ QList<ServerInfo_Ban> Servatrice_DatabaseInterface::getUserBanHistory(const QStr
     query->bindValue(":user_name", userName);
 
     if (!execSqlQuery(query)) {
-        qCWarning(DatabaseInterfaceLog) << "Failed to collect ban history information: SQL Error";
+        qDebug("Failed to collect ban history information: SQL Error");
         return results;
     }
 
@@ -1234,9 +1155,8 @@ 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 =
@@ -1248,7 +1168,7 @@ bool Servatrice_DatabaseInterface::addWarning(const QString userName,
     query->bindValue(":warn_reason", warningReason);
     query->bindValue(":client_id", clientID);
     if (!execSqlQuery(query)) {
-        qCWarning(DatabaseInterfaceLog) << "Failed to collect create warning history information: SQL Error";
+        qDebug("Failed to collect create warning history information: SQL Error");
         return false;
     }
 
@@ -1260,9 +1180,8 @@ 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 =
@@ -1270,7 +1189,7 @@ QList<ServerInfo_Warning> Servatrice_DatabaseInterface::getUserWarnHistory(const
     query->bindValue(":user_id", userID);
 
     if (!execSqlQuery(query)) {
-        qCWarning(DatabaseInterfaceLog) << "Failed to collect warning history information: SQL Error";
+        qDebug("Failed to collect warning history information: SQL Error");
         return results;
     }
 
@@ -1300,9 +1219,8 @@ 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
@@ -1311,58 +1229,48 @@ 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()) {
@@ -1388,7 +1296,7 @@ QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory
     }
 
     if (!execSqlQuery(query)) {
-        qCWarning(DatabaseInterfaceLog) << "Failed to collect log history information: SQL Error";
+        qDebug("Failed to collect log history information: SQL Error");
         return results;
     }
 
@@ -1409,101 +1317,86 @@ 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)) {
-        qCWarning(DatabaseInterfaceLog)
-            << "Failed to identify the number of users accounts for users email address: SQL Error";
+        qDebug("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;
 }
@@ -1513,27 +1406,22 @@ 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;
 }
@@ -1545,17 +1433,14 @@ 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/server_logger.cpp b/servatrice/src/server_logger.cpp
index 620780052..de0befacb 100644
--- a/servatrice/src/server_logger.cpp
+++ b/servatrice/src/server_logger.cpp
@@ -39,23 +39,20 @@ 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();
@@ -63,9 +60,8 @@ void ServerLogger::logMessage(const QString &message, void *caller)
     QStringList listlogFilters = logFilters.split(",", Qt::SkipEmptyParts);
     bool shouldWeSkipLine = false;
 
-    if (!shouldWeWriteLog) {
+    if (!shouldWeWriteLog)
         return;
-    }
 
     if (!logFilters.trimmed().isEmpty()) {
         shouldWeSkipLine = true;
@@ -77,9 +73,8 @@ void ServerLogger::logMessage(const QString &message, void *caller)
         }
     }
 
-    if (shouldWeSkipLine) {
+    if (shouldWeSkipLine)
         return;
-    }
 
     bufferMutex.lock();
     buffer.append(QDateTime::currentDateTime().toString() + " " + callerString + message);
@@ -89,9 +84,8 @@ void ServerLogger::logMessage(const QString &message, void *caller)
 
 void ServerLogger::flushBuffer()
 {
-    if (flushRunning) {
+    if (flushRunning)
         return;
-    }
 
     flushRunning = true;
     QTextStream stream(logFile);
@@ -109,17 +103,15 @@ 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();
 
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index bc90a3ef1..619d36d3a 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -31,7 +31,6 @@
 #include <QDateTime>
 #include <QDebug>
 #include <QHostAddress>
-#include <QLoggingCategory>
 #include <QRegularExpression>
 #include <QSqlError>
 #include <QSqlQuery>
@@ -84,10 +83,6 @@
 #include <server_room.h>
 #include <string>
 
-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;
 
 AbstractServerSocketInterface::AbstractServerSocketInterface(Servatrice *_server,
@@ -117,9 +112,8 @@ 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)) {
@@ -136,7 +130,7 @@ bool AbstractServerSocketInterface::initSession()
 
 void AbstractServerSocketInterface::catchSocketError(QAbstractSocket::SocketError socketError)
 {
-    qCWarning(AbstractServerSocketInterfaceLog) << "Socket error:" << socketError;
+    qDebug() << "Socket error:" << socketError;
 
     prepareDestroy();
 }
@@ -271,44 +265,35 @@ 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());
@@ -321,41 +306,33 @@ 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());
@@ -367,30 +344,25 @@ 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)
@@ -404,32 +376,28 @@ bool AbstractServerSocketInterface::deckListHelper(int folderId, ServerInfo_Deck
         "select id, name 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)) {
+    if (!sqlInterface->execSqlQuery(query))
         return false;
-    }
 
     QMap<int, QString> results;
-    while (query->next()) {
+    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())) {
+        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");
     query->bindValue(":id_folder", folderId);
     query->bindValue(":id_user", userInfo->id());
-    if (!sqlInterface->execSqlQuery(query)) {
+    if (!sqlInterface->execSqlQuery(query))
         return false;
-    }
 
     while (query->next()) {
         ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items();
@@ -449,18 +417,16 @@ 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))
         return Response::RespContextError;
-    }
 
     rc.setResponseExtension(re);
     return Response::RespOk;
@@ -469,31 +435,27 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckList(const Command_
 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;
 }
 
@@ -504,9 +466,8 @@ 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);
@@ -521,9 +482,8 @@ 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");
@@ -537,25 +497,22 @@ 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 =
@@ -563,9 +520,8 @@ 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());
@@ -577,32 +533,27 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckDel(const Command_D
 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;
-    }
 
     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";
-    }
 
     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, "
@@ -629,9 +580,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman
         query->bindValue(":content", deckStr);
         sqlInterface->execSqlQuery(query);
 
-        if (query->numRowsAffected() == 0) {
+        if (query->numRowsAffected() == 0)
             return Response::RespNameNotFound;
-        }
 
         Response_DeckUpload *re = new Response_DeckUpload;
         ServerInfo_DeckStorage_TreeItem *fileInfo = re->mutable_new_file();
@@ -639,9 +589,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman
         fileInfo->set_name(deckName.toStdString());
         fileInfo->mutable_file()->set_creation_time(QDateTime::currentDateTime().toSecsSinceEpoch());
         rc.setResponseExtension(re);
-    } else {
+    } else
         return Response::RespInvalidData;
-    }
 
     return Response::RespOk;
 }
@@ -649,9 +598,8 @@ 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 {
@@ -671,9 +619,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckDownload(const Comm
 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;
 
@@ -702,9 +649,8 @@ 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 =
@@ -727,9 +673,8 @@ 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 =
@@ -737,22 +682,18 @@ 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();
 
@@ -766,13 +707,11 @@ 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");
@@ -780,31 +719,27 @@ 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;
 }
 
@@ -824,9 +759,8 @@ 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()) {
@@ -844,9 +778,8 @@ 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
     {
@@ -854,12 +787,10 @@ 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());
@@ -958,15 +889,12 @@ 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")
             chatType = true;
-        }
     }
 
     int dateRange = cmd.date_range();
@@ -977,9 +905,8 @@ 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()) {
+        while (messageIterator.hasNext())
             re->add_log_message()->CopyFrom(messageIterator.next());
-        }
     } else {
         ServerInfo_ChatMessage chatMessage;
 
@@ -1017,9 +944,8 @@ 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);
@@ -1034,9 +960,8 @@ 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;
 }
@@ -1065,9 +990,8 @@ 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;
 }
@@ -1127,18 +1051,16 @@ 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) {
@@ -1146,9 +1068,8 @@ 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, "
@@ -1169,9 +1090,8 @@ 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())) {
@@ -1180,15 +1100,14 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com
         clientIdQuery->bindValue(":client_id", nameFromStdString(cmd.clientid()));
         sqlInterface->execSqlQuery(clientIdQuery);
         if (!sqlInterface->execSqlQuery(clientIdQuery)) {
-            qCWarning(AbstractServerSocketInterfaceLog) << "ClientID username ban lookup failed: SQL Error";
+            qDebug("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);
-                }
             }
         }
     }
@@ -1197,12 +1116,10 @@ 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);
@@ -1214,15 +1131,12 @@ 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()));
@@ -1238,14 +1152,13 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
 {
     QString userName = nameFromStdString(cmd.user_name());
     QString clientId = nameFromStdString(cmd.clientid());
-    qCDebug(AbstractServerSocketInterfaceLog) << "Got register command for user:" << userName;
+    qDebug() << "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;
     }
@@ -1278,21 +1191,19 @@ 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());
@@ -1301,19 +1212,17 @@ 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;
     }
@@ -1321,11 +1230,10 @@ 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;
     }
@@ -1333,26 +1241,23 @@ 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;
     }
@@ -1362,9 +1267,8 @@ 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())) {
@@ -1385,35 +1289,31 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
                                                    country, !requireEmailActivation);
 
     if (regSucceeded) {
-        qCDebug(AbstractServerSocketInterfaceLog) << "Accepted register command for user:" << userName;
+        qDebug() << "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;
     }
@@ -1421,7 +1321,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
 
 bool AbstractServerSocketInterface::tooManyRegistrationAttempts(const QString &ipAddress)
 {
-    //! \todo Implement registration attempt limiting.
+    //! \todo implement
     Q_UNUSED(ipAddress);
     return false;
 }
@@ -1433,27 +1333,24 @@ 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)) {
-        qCDebug(AbstractServerSocketInterfaceLog) << "Accepted activation for user" << userName;
+        qDebug() << "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 {
-        qCDebug(AbstractServerSocketInterfaceLog) << "Failed activation for user" << userName;
+        qDebug() << "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;
     }
@@ -1462,9 +1359,8 @@ 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()));
@@ -1473,9 +1369,8 @@ 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{};
@@ -1506,9 +1401,8 @@ 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);
@@ -1526,9 +1420,8 @@ 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());
@@ -1546,9 +1439,8 @@ 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);
@@ -1557,9 +1449,8 @@ 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;
@@ -1568,25 +1459,21 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountImage(const Comm
 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 {
@@ -1594,9 +1481,8 @@ 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;
-    }
 
     return Response::RespOk;
 }
@@ -1607,13 +1493,12 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordRequest(c
     const QString userName = nameFromStdString(cmd.user_name());
     const QString clientId = nameFromStdString(cmd.clientid());
 
-    qCDebug(AbstractServerSocketInterfaceLog) << "Received reset password request from user:" << userName;
+    qDebug() << "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;
     }
@@ -1626,10 +1511,9 @@ 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;
     }
@@ -1644,10 +1528,9 @@ 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);
@@ -1658,10 +1541,9 @@ 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;
     }
@@ -1693,23 +1575,21 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordReset(con
     Q_UNUSED(rc);
     QString userName = nameFromStdString(cmd.user_name());
     QString clientId = nameFromStdString(cmd.clientid());
-    qCDebug(AbstractServerSocketInterfaceLog) << "Received reset password reset from user:" << userName;
+    qDebug() << "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;
     }
@@ -1717,9 +1597,8 @@ 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) {
@@ -1729,10 +1608,9 @@ 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->removeForgotPassword(nameFromStdString(cmd.user_name()));
         return Response::RespOk;
@@ -1748,7 +1626,7 @@ AbstractServerSocketInterface::cmdForgotPasswordChallenge(const Command_ForgotPa
     const QString userName = nameFromStdString(cmd.user_name());
     const QString clientId = nameFromStdString(cmd.clientid());
 
-    qCDebug(AbstractServerSocketInterfaceLog) << "Received reset password challenge from user:" << userName;
+    qDebug() << "Received reset password challenge from user:" << userName;
 
     if (!servatrice->getEnableForgotPasswordChallenge()) {
         if (servatrice->getEnableForgotPasswordAudit()) {
@@ -2078,9 +1956,8 @@ void TcpServerSocketInterface::initSessionDeprecated()
 void TcpServerSocketInterface::flushOutputQueue()
 {
     QMutexLocker locker(&outputQueueMutex);
-    if (outputQueue.isEmpty()) {
+    if (outputQueue.isEmpty())
         return;
-    }
 
     int totalBytes = 0;
     while (!outputQueue.isEmpty()) {
@@ -2094,16 +1971,13 @@ void TcpServerSocketInterface::flushOutputQueue()
         unsigned int size = static_cast<unsigned int>(item.ByteSize());
 #endif
         buf.resize(size + 4);
-        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!";
-        }
+        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);
 
         totalBytes += size + 4;
         locker.relock();
@@ -2129,66 +2003,55 @@ void TcpServerSocketInterface::readClient()
                                 ((quint32)(unsigned char)inputBuffer[3]);
                 inputBuffer.remove(0, 4);
                 messageInProgress = true;
-            } else {
+            } else
                 return;
-            }
         }
-        if (inputBuffer.size() < messageLength || messageLength < 0) {
+        if (inputBuffer.size() < messageLength || messageLength < 0)
             return;
-        }
 
         CommandContainer newCommandContainer;
-        bool ok;
         try {
-            ok = newCommandContainer.ParseFromArray(inputBuffer.data(), messageLength);
+            newCommandContainer.ParseFromArray(inputBuffer.data(), messageLength);
         } catch (std::exception &e) {
-            qCWarning(TcpServerSocketInterfaceLog) << "Caught std::exception in" << __FILE__ << __LINE__ <<
+            qDebug() << "Caught std::exception in" << __FILE__ << __LINE__ <<
 #ifdef _MSC_VER // Visual Studio
-                __FUNCTION__
+                __FUNCTION__;
 #else
-                __PRETTY_FUNCTION__
+                __PRETTY_FUNCTION__;
 #endif
-                                                   << Qt::endl
-                                                   << "Exception:" << e.what() << Qt::endl
-                                                   << "Message coming from:" << getAddress() << Qt::endl
-                                                   << "Message length:" << messageLength << Qt::endl
-                                                   << "Message content:" << inputBuffer.toHex();
+            qDebug() << "Exception:" << e.what();
+            qDebug() << "Message coming from:" << getAddress();
+            qDebug() << "Message length:" << messageLength;
+            qDebug() << "Message content:" << inputBuffer.toHex();
         } catch (...) {
-            qCWarning(TcpServerSocketInterfaceLog) << "Unhandled exception in" << __FILE__ << __LINE__ <<
+            qDebug() << "Unhandled exception in" << __FILE__ << __LINE__ <<
 #ifdef _MSC_VER // Visual Studio
-                __FUNCTION__
+                __FUNCTION__;
 #else
-                __PRETTY_FUNCTION__
+                __PRETTY_FUNCTION__;
 #endif
-                                                   << Qt::endl
-                                                   << "Message coming from:" << getAddress();
+            qDebug() << "Message coming from:" << getAddress();
         }
+
         inputBuffer.remove(0, messageLength);
         messageInProgress = false;
 
-        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!";
+        // 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
     } 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();
@@ -2260,16 +2123,14 @@ 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();
@@ -2296,9 +2157,8 @@ bool WebsocketServerSocketInterface::initWebsocketSession()
 void WebsocketServerSocketInterface::flushOutputQueue()
 {
     QMutexLocker locker(&outputQueueMutex);
-    if (outputQueue.isEmpty()) {
+    if (outputQueue.isEmpty())
         return;
-    }
 
     qint64 totalBytes = 0;
     while (!outputQueue.isEmpty()) {
@@ -2312,12 +2172,9 @@ void WebsocketServerSocketInterface::flushOutputQueue()
         unsigned int size = static_cast<unsigned int>(item.ByteSize());
 #endif
         buf.resize(size);
-        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!";
-        }
+        item.SerializeToArray(buf.data(), size);
+        // In case socket->write() calls catchSocketError(), the mutex must not be locked during this call.
+        writeToSocket(buf);
 
         totalBytes += size;
         locker.relock();
@@ -2333,37 +2190,30 @@ void WebsocketServerSocketInterface::binaryMessageReceived(const QByteArray &mes
     servatrice->incRxBytes(message.size());
 
     CommandContainer newCommandContainer;
-    bool ok;
     try {
-        ok = newCommandContainer.ParseFromArray(message.data(), message.size());
+        newCommandContainer.ParseFromArray(message.data(), message.size());
     } catch (std::exception &e) {
-        qCWarning(WebsocketServerSocketInterfaceLog) << "Caught std::exception in" << __FILE__ << __LINE__ <<
+        qDebug() << "Caught std::exception in" << __FILE__ << __LINE__ <<
 #ifdef _MSC_VER // Visual Studio
-            __FUNCTION__
+            __FUNCTION__;
 #else
-            __PRETTY_FUNCTION__
+            __PRETTY_FUNCTION__;
 #endif
-                                                     << Qt::endl
-                                                     << "Exception:" << e.what() << Qt::endl
-                                                     << "Message coming from:" << getAddress() << Qt::endl
-                                                     << "Message length:" << message.size() << Qt::endl
-                                                     << "Message content:" << message.toHex();
+        qDebug() << "Exception:" << e.what();
+        qDebug() << "Message coming from:" << getAddress();
+        qDebug() << "Message length:" << message.size();
+        qDebug() << "Message content:" << message.toHex();
     } catch (...) {
-        qCWarning(WebsocketServerSocketInterfaceLog) << "Unhandled exception in" << __FILE__ << __LINE__ <<
+        qDebug() << "Unhandled exception in" << __FILE__ << __LINE__ <<
 #ifdef _MSC_VER // Visual Studio
-            __FUNCTION__
+            __FUNCTION__;
 #else
-            __PRETTY_FUNCTION__
+            __PRETTY_FUNCTION__;
 #endif
-                                                     << Qt::endl
-                                                     << "Message coming from:" << getAddress();
+        qDebug() << "Message coming from:" << getAddress();
     }
 
-    if (ok) {
-        processCommandContainer(newCommandContainer);
-    } else {
-        qCWarning(WebsocketServerSocketInterfaceLog) << "parsing error!";
-    }
+    processCommandContainer(newCommandContainer);
 }
 
 bool AbstractServerSocketInterface::isPasswordLongEnough(const int passwordLength)
diff --git a/servatrice/src/settingscache.cpp b/servatrice/src/settingscache.cpp
index f6c862904..f6dcd5fc8 100644
--- a/servatrice/src/settingscache.cpp
+++ b/servatrice/src/settingscache.cpp
@@ -30,16 +30,14 @@ 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/signalhandler.cpp b/servatrice/src/signalhandler.cpp
index b4513979f..f7cb207a9 100644
--- a/servatrice/src/signalhandler.cpp
+++ b/servatrice/src/signalhandler.cpp
@@ -86,11 +86,10 @@ 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/smtpclient.cpp b/servatrice/src/smtpclient.cpp
index 3ec333413..ee7214904 100644
--- a/servatrice/src/smtpclient.cpp
+++ b/servatrice/src/smtpclient.cpp
@@ -125,13 +125,11 @@ bool SmtpClient::enqueueForgotPasswordTokenMail(const QString &nickname, const Q
 void SmtpClient::sendAllEmails()
 {
     // still connected from the previous round
-    if (smtp->socket()->state() == QAbstractSocket::ConnectedState) {
+    if (smtp->socket()->state() == QAbstractSocket::ConnectedState)
         return;
-    }
 
-    if (smtp->pendingMessages() == 0) {
+    if (smtp->pendingMessages() == 0)
         return;
-    }
 
     QString connectionType = settingsCache->value("smtp/connection", "tcp").toString();
     QString host = settingsCache->value("smtp/host", "localhost").toString();
@@ -145,9 +143,8 @@ void SmtpClient::sendAllEmails()
 
     // Connect
     if (connectionType == "ssl") {
-        if (acceptAllCerts) {
+        if (acceptAllCerts)
             smtp->sslSocket()->setPeerVerifyMode(QSslSocket::QueryPeer);
-        }
         smtp->connectToSecureHost(host, port);
     } else {
         smtp->connectToHost(host, port);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 04ac7fcee..c5346e59f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,8 +6,6 @@ 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)
-add_test(NAME server_card_counter_test COMMAND server_card_counter_test)
-add_test(NAME server_counter_test COMMAND server_counter_test)
 
 add_test(NAME deck_hash_performance_test COMMAND deck_hash_performance_test)
 set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 5)
@@ -19,8 +17,6 @@ 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)
 add_executable(deck_hash_performance_test deck_hash_performance_test.cpp)
-add_executable(server_card_counter_test server_card_counter_test.cpp)
-add_executable(server_counter_test server_counter_test.cpp)
 
 find_package(GTest)
 
@@ -52,16 +48,12 @@ if(NOT GTEST_FOUND)
   add_dependencies(test_age_formatting gtest)
   add_dependencies(password_hash_test gtest)
   add_dependencies(deck_hash_performance_test gtest)
-  add_dependencies(server_card_counter_test gtest)
-  add_dependencies(server_counter_test gtest)
 endif()
 
 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 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}
 )
@@ -69,15 +61,8 @@ target_link_libraries(
   deck_hash_performance_test libcockatrice_deck_list libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES}
   ${TEST_QT_MODULES}
 )
-target_link_libraries(
-  server_card_counter_test libcockatrice_network Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
-)
-target_link_libraries(
-  server_counter_test libcockatrice_network Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
-)
 
 add_subdirectory(card_zone_algorithms)
 add_subdirectory(carddatabase)
 add_subdirectory(loading_from_clipboard)
-add_subdirectory(movecard_tests)
 add_subdirectory(oracle)
diff --git a/tests/card_zone_algorithms/CMakeLists.txt b/tests/card_zone_algorithms/CMakeLists.txt
index e03d8f77d..889e92eaa 100644
--- a/tests/card_zone_algorithms/CMakeLists.txt
+++ b/tests/card_zone_algorithms/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(card_zone_algorithms_test card_zone_algorithms_test.cpp)
 
-target_include_directories(card_zone_algorithms_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones)
+target_include_directories(card_zone_algorithms_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones/logic)
 
 target_link_libraries(
   card_zone_algorithms_test
diff --git a/tests/movecard_tests/CMakeLists.txt b/tests/movecard_tests/CMakeLists.txt
deleted file mode 100755
index 769047148..000000000
--- a/tests/movecard_tests/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-add_executable(reverse_card_move_test reverse_card_move_test.cpp)
-
-if(NOT GTEST_FOUND)
-  add_dependencies(reverse_card_move_test gtest)
-endif()
-
-target_link_libraries(
-  reverse_card_move_test
-  PRIVATE libcockatrice_network_server_remote
-  PRIVATE libcockatrice_rng
-  PRIVATE Threads::Threads
-  PRIVATE ${GTEST_BOTH_LIBRARIES}
-  PRIVATE ${TEST_QT_MODULES}
-)
-
-add_test(NAME reverse_card_move_test COMMAND reverse_card_move_test)
diff --git a/tests/movecard_tests/reverse_card_move_test.cpp b/tests/movecard_tests/reverse_card_move_test.cpp
deleted file mode 100644
index 2231a7e3b..000000000
--- a/tests/movecard_tests/reverse_card_move_test.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "game/server_abstract_player.h"
-#include "game/server_card.h"
-#include "game/server_cardzone.h"
-#include "game/server_game.h"
-#include "server_response_containers.h"
-#include "server_room.h"
-#include "server_test_helpers.h"
-
-#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>
-
-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);
-    Server_Game game(user, 1, "", "", 2, QList<int>(), false, false, false, false, false, false, 20, false, &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
deleted file mode 100644
index fd2ed6c17..000000000
--- a/tests/movecard_tests/server_test_helpers.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#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/server_card_counter_test.cpp b/tests/server_card_counter_test.cpp
deleted file mode 100644
index ff906b906..000000000
--- a/tests/server_card_counter_test.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/** @file server_card_counter_test.cpp
- *  @brief Tests for Server_Card counter operations.
- *  @ingroup Tests
- */
-
-#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/trice_limits.h>
-#include <limits>
-
-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_COUNTERS_ON_CARD));
-    EXPECT_FALSE(card.incrementCounter(1, 1));
-    EXPECT_EQ(card.getCounter(1), MAX_COUNTERS_ON_CARD);
-}
-
-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_COUNTERS_ON_CARD - 5));
-
-    Event_SetCardCounter event;
-    EXPECT_TRUE(card.incrementCounter(1, 10, &event));
-
-    EXPECT_EQ(event.counter_id(), 1);
-    EXPECT_EQ(event.counter_value(), MAX_COUNTERS_ON_CARD);
-}
-
-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_COUNTERS_ON_CARD));
-
-    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_COUNTERS_ON_CARD);
-}
-
-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_COUNTERS_ON_CARD - 5));
-    EXPECT_TRUE(card.incrementCounter(1, 10));
-    EXPECT_EQ(card.getCounter(1), MAX_COUNTERS_ON_CARD);
-}
-
-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
deleted file mode 100644
index 0f41f2cbd..000000000
--- a/tests/server_counter_test.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/** @file server_counter_test.cpp
- *  @brief Tests for Server_Counter operations.
- *  @ingroup Tests
- */
-
-#include <gtest/gtest.h>
-#include <libcockatrice/network/server/remote/game/server_counter.h>
-#include <limits>
-
-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/test_age_formatting.cpp b/tests/test_age_formatting.cpp
index 6a9d5d4af..e4fc64cf9 100644
--- a/tests/test_age_formatting.cpp
+++ b/tests/test_age_formatting.cpp
@@ -1,5 +1,6 @@
+#include "../cockatrice/src/interface/widgets/server/user/user_info_box.h"
+
 #include "gtest/gtest.h"
-#include <libcockatrice/utility/days_years_between.h>
 
 namespace
 {
@@ -7,31 +8,31 @@ using dayyear = QPair<int, int>;
 
 TEST(AgeFormatting, Zero)
 {
-    auto got = getDaysAndYearsBetween(QDate(2000, 1, 1), QDate(2000, 1, 1));
+    auto got = UserInfoBox::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 = getDaysAndYearsBetween(QDate(2000, 2, 28), QDate(2000, 3, 1));
+    auto got = UserInfoBox::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 = getDaysAndYearsBetween(QDate(2000, 1, 1), QDate(2001, 1, 1));
+    auto got = UserInfoBox::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 = getDaysAndYearsBetween(QDate(2000, 2, 28), QDate(2001, 3, 1));
+    auto got = UserInfoBox::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 = getDaysAndYearsBetween(QDate(2003, 2, 28), QDate(2004, 3, 1));
+    auto got = UserInfoBox::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/vcpkg b/vcpkg
index 56bb24116..74e653621 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit 56bb2411609227288b70117ead2c47585ba07713
+Subproject commit 74e6536215718009aae747d86d84b78376bf9e09
diff --git a/webclient/.env b/webclient/.env
new file mode 100644
index 000000000..8592b28b4
--- /dev/null
+++ b/webclient/.env
@@ -0,0 +1 @@
+# Future template for server admin configuration
diff --git a/webclient/.env.development b/webclient/.env.development
new file mode 100644
index 000000000..2accbba81
--- /dev/null
+++ b/webclient/.env.development
@@ -0,0 +1 @@
+ESLINT_NO_DEV_ERRORS=true
diff --git a/webclient/.env.production b/webclient/.env.production
new file mode 100644
index 000000000..02269f00d
--- /dev/null
+++ b/webclient/.env.production
@@ -0,0 +1 @@
+DISABLE_ESLINT_PLUGIN=true
diff --git a/webclient/.env.test b/webclient/.env.test
new file mode 100644
index 000000000..8711f95ab
--- /dev/null
+++ b/webclient/.env.test
@@ -0,0 +1 @@
+CI=true
diff --git a/webclient/.eslintrc.js b/webclient/.eslintrc.js
new file mode 100644
index 000000000..98ce44430
--- /dev/null
+++ b/webclient/.eslintrc.js
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 000000000..2b30e2c8d
--- /dev/null
+++ b/webclient/.gitignore
@@ -0,0 +1,27 @@
+# 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
new file mode 100644
index 000000000..521a9f7c0
--- /dev/null
+++ b/webclient/.npmrc
@@ -0,0 +1 @@
+legacy-peer-deps=true
diff --git a/webclient/README.md b/webclient/README.md
new file mode 100644
index 000000000..436ab4fad
--- /dev/null
+++ b/webclient/README.md
@@ -0,0 +1,73 @@
+## 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
new file mode 100644
index 000000000..0226eb201
Binary files /dev/null and b/webclient/architecture.png differ
diff --git a/webclient/package-lock.json b/webclient/package-lock.json
new file mode 100644
index 000000000..6b12b4ad6
--- /dev/null
+++ b/webclient/package-lock.json
@@ -0,0 +1,34786 @@
+{
+  "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.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="
+    },
+    "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.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "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-import-phases": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
+      "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "acorn": "^8.14.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/baseline-browser-mapping": {
+      "version": "2.9.19",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz",
+      "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.js"
+      }
+    },
+    "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.28.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
+      "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
+      "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": {
+        "baseline-browser-mapping": "^2.9.0",
+        "caniuse-lite": "^1.0.30001759",
+        "electron-to-chromium": "^1.5.263",
+        "node-releases": "^2.0.27",
+        "update-browserslist-db": "^1.2.0"
+      },
+      "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.30001769",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001769.tgz",
+      "integrity": "sha512-BCfFL1sHijQlBGWBMuJyhZUhzo7wer5sVj9hqekB/7xn0Ypy+pER/edCYQm4exbXj4WiySGp40P8UuTh6w1srg==",
+      "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.286",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz",
+      "integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A=="
+    },
+    "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.19.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.19.0.tgz",
+      "integrity": "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.3.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": "2.0.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz",
+      "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw=="
+    },
+    "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.1",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
+      "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
+      "engines": {
+        "node": ">=6.11.5"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "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.27",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA=="
+    },
+    "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.3.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
+      "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "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.16",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz",
+      "integrity": "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==",
+      "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.2.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
+      "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.5.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz",
+      "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==",
+      "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.105.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.0.tgz",
+      "integrity": "sha512-gX/dMkRQc7QOMzgTe6KsYFM7DxeIONQSui1s0n/0xht36HvrgbxtM1xBlgx596NbpHuQU8P7QpKwrZYwUX48nw==",
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.8",
+        "@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.15.0",
+        "acorn-import-phases": "^1.0.3",
+        "browserslist": "^4.28.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.19.0",
+        "es-module-lexer": "^2.0.0",
+        "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.3.1",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^4.3.3",
+        "tapable": "^2.3.0",
+        "terser-webpack-plugin": "^5.3.16",
+        "watchpack": "^2.5.1",
+        "webpack-sources": "^3.3.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.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
+      "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
+      "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.3",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+      "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
+      "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.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="
+    },
+    "@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.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="
+    },
+    "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-import-phases": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
+      "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ=="
+    },
+    "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=="
+    },
+    "baseline-browser-mapping": {
+      "version": "2.9.19",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz",
+      "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg=="
+    },
+    "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.28.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
+      "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
+      "requires": {
+        "baseline-browser-mapping": "^2.9.0",
+        "caniuse-lite": "^1.0.30001759",
+        "electron-to-chromium": "^1.5.263",
+        "node-releases": "^2.0.27",
+        "update-browserslist-db": "^1.2.0"
+      }
+    },
+    "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.30001769",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001769.tgz",
+      "integrity": "sha512-BCfFL1sHijQlBGWBMuJyhZUhzo7wer5sVj9hqekB/7xn0Ypy+pER/edCYQm4exbXj4WiySGp40P8UuTh6w1srg=="
+    },
+    "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.286",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz",
+      "integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A=="
+    },
+    "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.19.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.19.0.tgz",
+      "integrity": "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==",
+      "requires": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.3.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": "2.0.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz",
+      "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw=="
+    },
+    "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.1",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
+      "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q=="
+    },
+    "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.27",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA=="
+    },
+    "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.3.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
+      "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg=="
+    },
+    "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.16",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz",
+      "integrity": "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==",
+      "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.2.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
+      "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.5.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz",
+      "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==",
+      "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.105.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.0.tgz",
+      "integrity": "sha512-gX/dMkRQc7QOMzgTe6KsYFM7DxeIONQSui1s0n/0xht36HvrgbxtM1xBlgx596NbpHuQU8P7QpKwrZYwUX48nw==",
+      "requires": {
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.8",
+        "@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.15.0",
+        "acorn-import-phases": "^1.0.3",
+        "browserslist": "^4.28.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.19.0",
+        "es-module-lexer": "^2.0.0",
+        "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.3.1",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^4.3.3",
+        "tapable": "^2.3.0",
+        "terser-webpack-plugin": "^5.3.16",
+        "watchpack": "^2.5.1",
+        "webpack-sources": "^3.3.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.3",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+          "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
+          "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.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
+      "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg=="
+    },
+    "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
new file mode 100644
index 000000000..a578fc9d9
--- /dev/null
+++ b/webclient/package.json
@@ -0,0 +1,94 @@
+{
+  "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
new file mode 100644
index 000000000..3b420f32c
--- /dev/null
+++ b/webclient/prebuild.js
@@ -0,0 +1,112 @@
+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
new file mode 100644
index 000000000..c2c86b859
Binary files /dev/null and b/webclient/public/favicon.ico differ
diff --git a/webclient/public/index.html b/webclient/public/index.html
new file mode 100644
index 000000000..c050e82f4
--- /dev/null
+++ b/webclient/public/index.html
@@ -0,0 +1,44 @@
+<!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
new file mode 100644
index 000000000..294f3fb9f
--- /dev/null
+++ b/webclient/public/locales/de/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..3c63e0abb
--- /dev/null
+++ b/webclient/public/locales/en_US/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..33a3db45c
--- /dev/null
+++ b/webclient/public/locales/es/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..12737731a
--- /dev/null
+++ b/webclient/public/locales/fi/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..aacd26d80
--- /dev/null
+++ b/webclient/public/locales/fr/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..74734384b
--- /dev/null
+++ b/webclient/public/locales/it/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..fffb18989
--- /dev/null
+++ b/webclient/public/locales/nl/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..abe400792
--- /dev/null
+++ b/webclient/public/locales/pl/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..10ad08603
--- /dev/null
+++ b/webclient/public/locales/pt_BR/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..5e92f790e
--- /dev/null
+++ b/webclient/public/locales/ru/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..46437f558
--- /dev/null
+++ b/webclient/public/locales/tok/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..b14041496
--- /dev/null
+++ b/webclient/public/locales/yue/translation.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..fa313abf5
Binary files /dev/null and b/webclient/public/logo192.png differ
diff --git a/webclient/public/logo512.png b/webclient/public/logo512.png
new file mode 100644
index 000000000..bd5d4b5e2
Binary files /dev/null and b/webclient/public/logo512.png differ
diff --git a/webclient/public/manifest.json b/webclient/public/manifest.json
new file mode 100644
index 000000000..080d6c77a
--- /dev/null
+++ b/webclient/public/manifest.json
@@ -0,0 +1,25 @@
+{
+  "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
new file mode 100644
index 000000000..571442132
--- /dev/null
+++ b/webclient/public/pb/.gitignore
@@ -0,0 +1,4 @@
+# Ignore all files
+* 
+# Except gitignore
+!.gitignore
\ No newline at end of file
diff --git a/webclient/public/reset.css b/webclient/public/reset.css
new file mode 100644
index 000000000..af944401f
--- /dev/null
+++ b/webclient/public/reset.css
@@ -0,0 +1,48 @@
+/* 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
new file mode 100644
index 000000000..01b0f9a10
--- /dev/null
+++ b/webclient/public/robots.txt
@@ -0,0 +1,2 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
diff --git a/webclient/src/api/AdminService.tsx b/webclient/src/api/AdminService.tsx
new file mode 100644
index 000000000..623ad546a
--- /dev/null
+++ b/webclient/src/api/AdminService.tsx
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..368390708
--- /dev/null
+++ b/webclient/src/api/AuthenticationService.tsx
@@ -0,0 +1,54 @@
+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
new file mode 100644
index 000000000..e7c8822e8
--- /dev/null
+++ b/webclient/src/api/ModeratorService.tsx
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000..bfb63d92a
--- /dev/null
+++ b/webclient/src/api/RoomsService.tsx
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000..051954f93
--- /dev/null
+++ b/webclient/src/api/SessionService.tsx
@@ -0,0 +1,45 @@
+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
new file mode 100644
index 000000000..c4f67092e
--- /dev/null
+++ b/webclient/src/api/index.ts
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..64a102c38
--- /dev/null
+++ b/webclient/src/common.i18n.json
@@ -0,0 +1,286 @@
+{
+  "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
new file mode 100644
index 000000000..976618634
--- /dev/null
+++ b/webclient/src/components/Card/Card.css
@@ -0,0 +1,4 @@
+.card {
+	width: 100%;
+	height: 100%;
+}
diff --git a/webclient/src/components/Card/Card.tsx b/webclient/src/components/Card/Card.tsx
new file mode 100644
index 000000000..f89622c3b
--- /dev/null
+++ b/webclient/src/components/Card/Card.tsx
@@ -0,0 +1,20 @@
+// 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
new file mode 100644
index 000000000..7009049d2
--- /dev/null
+++ b/webclient/src/components/CardDetails/CardDetails.css
@@ -0,0 +1,45 @@
+.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
new file mode 100644
index 000000000..84196fda6
--- /dev/null
+++ b/webclient/src/components/CardDetails/CardDetails.tsx
@@ -0,0 +1,130 @@
+// 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
new file mode 100644
index 000000000..e69de29bb
diff --git a/webclient/src/components/CheckboxField/CheckboxField.tsx b/webclient/src/components/CheckboxField/CheckboxField.tsx
new file mode 100644
index 000000000..562687489
--- /dev/null
+++ b/webclient/src/components/CheckboxField/CheckboxField.tsx
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000..9b1679516
--- /dev/null
+++ b/webclient/src/components/CountryDropdown/CountryDropdown.css
@@ -0,0 +1,13 @@
+.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
new file mode 100644
index 000000000..09b1cf71e
--- /dev/null
+++ b/webclient/src/components/CountryDropdown/CountryDropdown.tsx
@@ -0,0 +1,56 @@
+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
new file mode 100644
index 000000000..eea42dc7b
--- /dev/null
+++ b/webclient/src/components/Guard/AuthGuard.tsx
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000..c8bc6d663
--- /dev/null
+++ b/webclient/src/components/Guard/ModGuard.tsx
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 000000000..25e784a3a
--- /dev/null
+++ b/webclient/src/components/InputAction/InputAction.css
@@ -0,0 +1,19 @@
+.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
new file mode 100644
index 000000000..459b89904
--- /dev/null
+++ b/webclient/src/components/InputAction/InputAction.tsx
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 000000000..819f7112a
--- /dev/null
+++ b/webclient/src/components/InputField/InputField.css
@@ -0,0 +1,20 @@
+.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
new file mode 100644
index 000000000..3299ba383
--- /dev/null
+++ b/webclient/src/components/InputField/InputField.tsx
@@ -0,0 +1,60 @@
+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
new file mode 100644
index 000000000..32a3a9fcc
--- /dev/null
+++ b/webclient/src/components/KnownHosts/KnownHosts.css
@@ -0,0 +1,70 @@
+.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
new file mode 100644
index 000000000..3de8fd887
--- /dev/null
+++ b/webclient/src/components/KnownHosts/KnownHosts.i18n.json
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 000000000..f65a98c38
--- /dev/null
+++ b/webclient/src/components/KnownHosts/KnownHosts.tsx
@@ -0,0 +1,285 @@
+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
new file mode 100644
index 000000000..c4db3d0d0
--- /dev/null
+++ b/webclient/src/components/LanguageDropdown/LanguageDropdown.css
@@ -0,0 +1,19 @@
+.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
new file mode 100644
index 000000000..8f63bd549
--- /dev/null
+++ b/webclient/src/components/LanguageDropdown/LanguageDropdown.tsx
@@ -0,0 +1,57 @@
+// 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
new file mode 100644
index 000000000..0011b238a
--- /dev/null
+++ b/webclient/src/components/Message/CardCallout.css
@@ -0,0 +1,4 @@
+.callout {
+  font-weight: bold;
+  color: green;
+}
diff --git a/webclient/src/components/Message/CardCallout.tsx b/webclient/src/components/Message/CardCallout.tsx
new file mode 100644
index 000000000..d34316541
--- /dev/null
+++ b/webclient/src/components/Message/CardCallout.tsx
@@ -0,0 +1,94 @@
+// 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
new file mode 100644
index 000000000..cbb0df2a9
--- /dev/null
+++ b/webclient/src/components/Message/Message.css
@@ -0,0 +1,3 @@
+.link {
+	color: blue;
+}
diff --git a/webclient/src/components/Message/Message.tsx b/webclient/src/components/Message/Message.tsx
new file mode 100644
index 000000000..ec0b05507
--- /dev/null
+++ b/webclient/src/components/Message/Message.tsx
@@ -0,0 +1,105 @@
+// 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
new file mode 100644
index 000000000..939a7d753
--- /dev/null
+++ b/webclient/src/components/ScrollToBottomOnChanges/ScrollToBottomOnChanges.tsx
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000..c59e851ae
--- /dev/null
+++ b/webclient/src/components/SelectField/SelectField.css
@@ -0,0 +1,4 @@
+.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
new file mode 100644
index 000000000..fdbef0e9c
--- /dev/null
+++ b/webclient/src/components/SelectField/SelectField.tsx
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000..f439dee5c
--- /dev/null
+++ b/webclient/src/components/ThreePaneLayout/ThreePaneLayout.css
@@ -0,0 +1,37 @@
+.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
new file mode 100644
index 000000000..7919f9d35
--- /dev/null
+++ b/webclient/src/components/ThreePaneLayout/ThreePaneLayout.tsx
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 000000000..4ef8a3cad
--- /dev/null
+++ b/webclient/src/components/Toast/Toast.tsx
@@ -0,0 +1,65 @@
+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
new file mode 100644
index 000000000..44753d87f
--- /dev/null
+++ b/webclient/src/components/Toast/ToastContext.tsx
@@ -0,0 +1,71 @@
+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
new file mode 100644
index 000000000..40e7c7368
--- /dev/null
+++ b/webclient/src/components/Toast/index.ts
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..3f600db52
--- /dev/null
+++ b/webclient/src/components/Toast/reducer.ts
@@ -0,0 +1,61 @@
+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
new file mode 100644
index 000000000..08f18b872
--- /dev/null
+++ b/webclient/src/components/Token/Token.css
@@ -0,0 +1,4 @@
+.token {
+	width: 100%;
+	height: 100%;
+}
diff --git a/webclient/src/components/Token/Token.tsx b/webclient/src/components/Token/Token.tsx
new file mode 100644
index 000000000..29b39ecc5
--- /dev/null
+++ b/webclient/src/components/Token/Token.tsx
@@ -0,0 +1,19 @@
+// 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
new file mode 100644
index 000000000..3c3267839
--- /dev/null
+++ b/webclient/src/components/TokenDetails/TokenDetails.css
@@ -0,0 +1,46 @@
+.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
new file mode 100644
index 000000000..f3d8aed96
--- /dev/null
+++ b/webclient/src/components/TokenDetails/TokenDetails.tsx
@@ -0,0 +1,86 @@
+// 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
new file mode 100644
index 000000000..0697c7f68
--- /dev/null
+++ b/webclient/src/components/UserDisplay/UserDisplay.css
@@ -0,0 +1,16 @@
+.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
new file mode 100644
index 000000000..9c45a0f51
--- /dev/null
+++ b/webclient/src/components/UserDisplay/UserDisplay.tsx
@@ -0,0 +1,150 @@
+// 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
new file mode 100644
index 000000000..330cd5a90
--- /dev/null
+++ b/webclient/src/components/VirtualList/VirtualList.css
@@ -0,0 +1,3 @@
+.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
new file mode 100644
index 000000000..e40ef712c
--- /dev/null
+++ b/webclient/src/components/VirtualList/VirtualList.tsx
@@ -0,0 +1,35 @@
+// 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
new file mode 100644
index 000000000..2d67b3003
--- /dev/null
+++ b/webclient/src/components/index.ts
@@ -0,0 +1,19 @@
+// 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
new file mode 100644
index 000000000..6b5c995a9
--- /dev/null
+++ b/webclient/src/containers/Account/Account.css
@@ -0,0 +1,53 @@
+.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
new file mode 100644
index 000000000..0c4e001a0
--- /dev/null
+++ b/webclient/src/containers/Account/Account.tsx
@@ -0,0 +1,120 @@
+// 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
new file mode 100644
index 000000000..3aa5489ad
--- /dev/null
+++ b/webclient/src/containers/Account/AddToBuddies.tsx
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000..270036946
--- /dev/null
+++ b/webclient/src/containers/Account/AddToIgnore.tsx
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000..4492a6bcf
--- /dev/null
+++ b/webclient/src/containers/App/AppShell.css
@@ -0,0 +1,10 @@
+.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
new file mode 100644
index 000000000..c28d20067
--- /dev/null
+++ b/webclient/src/containers/App/AppShell.tsx
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 000000000..c80f74c30
--- /dev/null
+++ b/webclient/src/containers/App/AppShellRoutes.tsx
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 000000000..ed9e1f241
--- /dev/null
+++ b/webclient/src/containers/App/FeatureDetection.tsx
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000..e69de29bb
diff --git a/webclient/src/containers/Decks/Decks.tsx b/webclient/src/containers/Decks/Decks.tsx
new file mode 100644
index 000000000..190196dc9
--- /dev/null
+++ b/webclient/src/containers/Decks/Decks.tsx
@@ -0,0 +1,20 @@
+// 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
new file mode 100644
index 000000000..e69de29bb
diff --git a/webclient/src/containers/Game/Game.tsx b/webclient/src/containers/Game/Game.tsx
new file mode 100644
index 000000000..694ffb46d
--- /dev/null
+++ b/webclient/src/containers/Game/Game.tsx
@@ -0,0 +1,20 @@
+// 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
new file mode 100644
index 000000000..d52eafd5f
--- /dev/null
+++ b/webclient/src/containers/Initialize/Initialize.css
@@ -0,0 +1,88 @@
+.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
new file mode 100644
index 000000000..77ca5e8cd
--- /dev/null
+++ b/webclient/src/containers/Initialize/Initialize.i18n.json
@@ -0,0 +1,6 @@
+{
+  "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
new file mode 100644
index 000000000..bc777f065
--- /dev/null
+++ b/webclient/src/containers/Initialize/Initialize.tsx
@@ -0,0 +1,71 @@
+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
new file mode 100644
index 000000000..a98cba47c
--- /dev/null
+++ b/webclient/src/containers/Layout/Layout.css
@@ -0,0 +1,31 @@
+.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
new file mode 100644
index 000000000..6d04172ba
--- /dev/null
+++ b/webclient/src/containers/Layout/Layout.tsx
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 000000000..85c851d2e
--- /dev/null
+++ b/webclient/src/containers/Layout/LeftNav.css
@@ -0,0 +1,128 @@
+.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
new file mode 100644
index 000000000..a81eb6ce2
--- /dev/null
+++ b/webclient/src/containers/Layout/LeftNav.tsx
@@ -0,0 +1,195 @@
+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
new file mode 100644
index 000000000..7ce83bd20
Binary files /dev/null and b/webclient/src/containers/Layout/logo.png differ
diff --git a/webclient/src/containers/Login/Login.css b/webclient/src/containers/Login/Login.css
new file mode 100644
index 000000000..7166187ad
--- /dev/null
+++ b/webclient/src/containers/Login/Login.css
@@ -0,0 +1,202 @@
+.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
new file mode 100644
index 000000000..13d248bb1
--- /dev/null
+++ b/webclient/src/containers/Login/Login.i18n.json
@@ -0,0 +1,22 @@
+{
+  "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
new file mode 100644
index 000000000..fe008375c
--- /dev/null
+++ b/webclient/src/containers/Login/Login.tsx
@@ -0,0 +1,360 @@
+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
new file mode 100644
index 000000000..3a6cbd185
--- /dev/null
+++ b/webclient/src/containers/Logs/LogResults.css
@@ -0,0 +1,3 @@
+.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
new file mode 100644
index 000000000..06abdbce6
--- /dev/null
+++ b/webclient/src/containers/Logs/LogResults.tsx
@@ -0,0 +1,122 @@
+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
new file mode 100644
index 000000000..37ac8eb03
--- /dev/null
+++ b/webclient/src/containers/Logs/Logs.css
@@ -0,0 +1,14 @@
+.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
new file mode 100644
index 000000000..a34a7b008
--- /dev/null
+++ b/webclient/src/containers/Logs/Logs.tsx
@@ -0,0 +1,109 @@
+// 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
new file mode 100644
index 000000000..74feff8bd
--- /dev/null
+++ b/webclient/src/containers/Player/Player.tsx
@@ -0,0 +1,18 @@
+// 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
new file mode 100644
index 000000000..623ab47f5
--- /dev/null
+++ b/webclient/src/containers/Room/Games.css
@@ -0,0 +1,30 @@
+.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
new file mode 100644
index 000000000..67a9239d3
--- /dev/null
+++ b/webclient/src/containers/Room/Games.tsx
@@ -0,0 +1,143 @@
+// 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
new file mode 100644
index 000000000..731002cb8
--- /dev/null
+++ b/webclient/src/containers/Room/Messages.css
@@ -0,0 +1,17 @@
+.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
new file mode 100644
index 000000000..24b576759
--- /dev/null
+++ b/webclient/src/containers/Room/Messages.tsx
@@ -0,0 +1,20 @@
+// 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
new file mode 100644
index 000000000..623ab47f5
--- /dev/null
+++ b/webclient/src/containers/Room/OpenGames.css
@@ -0,0 +1,30 @@
+.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
new file mode 100644
index 000000000..49d4d2503
--- /dev/null
+++ b/webclient/src/containers/Room/OpenGames.tsx
@@ -0,0 +1,143 @@
+// 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
new file mode 100644
index 000000000..4b6aaec93
--- /dev/null
+++ b/webclient/src/containers/Room/Room.css
@@ -0,0 +1,45 @@
+.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
new file mode 100644
index 000000000..c73930d7f
--- /dev/null
+++ b/webclient/src/containers/Room/Room.tsx
@@ -0,0 +1,104 @@
+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
new file mode 100644
index 000000000..4dd62dfb4
--- /dev/null
+++ b/webclient/src/containers/Room/SayMessage.tsx
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..bfcdc82cf
--- /dev/null
+++ b/webclient/src/containers/Server/Rooms.css
@@ -0,0 +1,26 @@
+.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
new file mode 100644
index 000000000..517f24380
--- /dev/null
+++ b/webclient/src/containers/Server/Rooms.tsx
@@ -0,0 +1,64 @@
+// 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
new file mode 100644
index 000000000..8d4e2e8dd
--- /dev/null
+++ b/webclient/src/containers/Server/Server.css
@@ -0,0 +1,34 @@
+.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
new file mode 100644
index 000000000..7ed5e2464
--- /dev/null
+++ b/webclient/src/containers/Server/Server.tsx
@@ -0,0 +1,77 @@
+// 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
new file mode 100644
index 000000000..46752e746
--- /dev/null
+++ b/webclient/src/containers/Unsupported/Unsupported.css
@@ -0,0 +1,18 @@
+.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
new file mode 100644
index 000000000..225a13a67
--- /dev/null
+++ b/webclient/src/containers/Unsupported/Unsupported.i18n.json
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 000000000..b666da12e
--- /dev/null
+++ b/webclient/src/containers/Unsupported/Unsupported.tsx
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000..f43de1c8e
--- /dev/null
+++ b/webclient/src/containers/index.ts
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000..5175ab845
--- /dev/null
+++ b/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.css
@@ -0,0 +1,13 @@
+.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
new file mode 100644
index 000000000..9cfd876f5
--- /dev/null
+++ b/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.i18n.json
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 000000000..cb5239619
--- /dev/null
+++ b/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.tsx
@@ -0,0 +1,44 @@
+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
new file mode 100644
index 000000000..b089ed200
--- /dev/null
+++ b/webclient/src/dialogs/CardImportDialog/CardImportDialog.css
@@ -0,0 +1,5 @@
+.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
new file mode 100644
index 000000000..8011d317a
--- /dev/null
+++ b/webclient/src/dialogs/CardImportDialog/CardImportDialog.tsx
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 000000000..e8a350f0d
--- /dev/null
+++ b/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.css
@@ -0,0 +1,26 @@
+.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
new file mode 100644
index 000000000..4ae521050
--- /dev/null
+++ b/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.i18n.json
@@ -0,0 +1,6 @@
+{
+ "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
new file mode 100644
index 000000000..5bde19d92
--- /dev/null
+++ b/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.tsx
@@ -0,0 +1,64 @@
+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
new file mode 100644
index 000000000..73822f190
--- /dev/null
+++ b/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.css
@@ -0,0 +1,10 @@
+.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
new file mode 100644
index 000000000..bc0aa646d
--- /dev/null
+++ b/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.i18n.json
@@ -0,0 +1,5 @@
+{
+  "RegistrationDialog": {
+    "title": "Create New Account"
+  }
+}
diff --git a/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.tsx b/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.tsx
new file mode 100644
index 000000000..2388dddb3
--- /dev/null
+++ b/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.tsx
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 000000000..731927c13
--- /dev/null
+++ b/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.css
@@ -0,0 +1,5 @@
+.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
new file mode 100644
index 000000000..c287b7a82
--- /dev/null
+++ b/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.i18n.json
@@ -0,0 +1,5 @@
+{
+  "RequestPasswordResetDialog": {
+    "title": "Request Password Reset"
+  }
+}
diff --git a/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.tsx b/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.tsx
new file mode 100644
index 000000000..be2032a08
--- /dev/null
+++ b/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.tsx
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 000000000..731927c13
--- /dev/null
+++ b/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.css
@@ -0,0 +1,5 @@
+.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
new file mode 100644
index 000000000..8047dcae0
--- /dev/null
+++ b/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.i18n.json
@@ -0,0 +1,5 @@
+{
+  "ResetPasswordDialog": {
+    "title": "Reset Password"
+  }
+}
diff --git a/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.tsx b/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.tsx
new file mode 100644
index 000000000..877c8729f
--- /dev/null
+++ b/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.tsx
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 000000000..5c5ace1c5
--- /dev/null
+++ b/webclient/src/dialogs/index.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..ffb4ecc77
--- /dev/null
+++ b/webclient/src/forms/AccountActivationForm/AccountActivationForm.css
@@ -0,0 +1,12 @@
+.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
new file mode 100644
index 000000000..0b510fb83
--- /dev/null
+++ b/webclient/src/forms/AccountActivationForm/AccountActivationForm.i18n.json
@@ -0,0 +1,10 @@
+{
+  "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
new file mode 100644
index 000000000..61b20f9a5
--- /dev/null
+++ b/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx
@@ -0,0 +1,69 @@
+// 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
new file mode 100644
index 000000000..56ac3e16e
--- /dev/null
+++ b/webclient/src/forms/CardImportForm/CardImportForm.css
@@ -0,0 +1,35 @@
+.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
new file mode 100644
index 000000000..b9745f31e
--- /dev/null
+++ b/webclient/src/forms/CardImportForm/CardImportForm.tsx
@@ -0,0 +1,227 @@
+// 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
new file mode 100644
index 000000000..76e1722e0
--- /dev/null
+++ b/webclient/src/forms/KnownHostForm/KnownHostForm.css
@@ -0,0 +1,21 @@
+.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
new file mode 100644
index 000000000..fe614a126
--- /dev/null
+++ b/webclient/src/forms/KnownHostForm/KnownHostForm.i18n.json
@@ -0,0 +1,9 @@
+{
+  "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
new file mode 100644
index 000000000..1241336f3
--- /dev/null
+++ b/webclient/src/forms/KnownHostForm/KnownHostForm.tsx
@@ -0,0 +1,94 @@
+// 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
new file mode 100644
index 000000000..4b176476f
--- /dev/null
+++ b/webclient/src/forms/LoginForm/LoginForm.css
@@ -0,0 +1,20 @@
+.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
new file mode 100644
index 000000000..260b88b27
--- /dev/null
+++ b/webclient/src/forms/LoginForm/LoginForm.i18n.json
@@ -0,0 +1,11 @@
+{
+  "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
new file mode 100644
index 000000000..1e8f104fe
--- /dev/null
+++ b/webclient/src/forms/LoginForm/LoginForm.tsx
@@ -0,0 +1,171 @@
+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
new file mode 100644
index 000000000..324aa7e63
--- /dev/null
+++ b/webclient/src/forms/RegisterForm/RegisterForm.css
@@ -0,0 +1,18 @@
+.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
new file mode 100644
index 000000000..50e802ea5
--- /dev/null
+++ b/webclient/src/forms/RegisterForm/RegisterForm.i18n.json
@@ -0,0 +1,10 @@
+{
+  "RegisterForm": {
+    "label": {
+      "register": "Register"
+    },
+    "toast": {
+      "registerSuccess": "Registration Successful!"
+    }
+  }
+}
diff --git a/webclient/src/forms/RegisterForm/RegisterForm.tsx b/webclient/src/forms/RegisterForm/RegisterForm.tsx
new file mode 100644
index 000000000..f5f4d9174
--- /dev/null
+++ b/webclient/src/forms/RegisterForm/RegisterForm.tsx
@@ -0,0 +1,177 @@
+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
new file mode 100644
index 000000000..83ed7420f
--- /dev/null
+++ b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.css
@@ -0,0 +1,25 @@
+.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
new file mode 100644
index 000000000..c53f6d097
--- /dev/null
+++ b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.i18n.json
@@ -0,0 +1,8 @@
+{
+  "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
new file mode 100644
index 000000000..01d4a2959
--- /dev/null
+++ b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx
@@ -0,0 +1,104 @@
+// 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
new file mode 100644
index 000000000..ad82b7efd
--- /dev/null
+++ b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.css
@@ -0,0 +1,21 @@
+.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
new file mode 100644
index 000000000..2835134c0
--- /dev/null
+++ b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.i18n.json
@@ -0,0 +1,8 @@
+{
+  "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
new file mode 100644
index 000000000..8b56f4b69
--- /dev/null
+++ b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
@@ -0,0 +1,115 @@
+// 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
new file mode 100644
index 000000000..9e3cd6cb8
--- /dev/null
+++ b/webclient/src/forms/SearchForm/SearchForm.css
@@ -0,0 +1,35 @@
+.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
new file mode 100644
index 000000000..793543086
--- /dev/null
+++ b/webclient/src/forms/SearchForm/SearchForm.tsx
@@ -0,0 +1,63 @@
+// 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
new file mode 100644
index 000000000..b922a9f40
--- /dev/null
+++ b/webclient/src/forms/index.ts
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..b5e9cca55
--- /dev/null
+++ b/webclient/src/hooks/index.ts
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..5258f58a7
--- /dev/null
+++ b/webclient/src/hooks/useAutoConnect.ts
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 000000000..65aee9982
--- /dev/null
+++ b/webclient/src/hooks/useDebounce.ts
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000..442da884f
--- /dev/null
+++ b/webclient/src/hooks/useFireOnce/index.ts
@@ -0,0 +1 @@
+export * from './useFireOnce'
diff --git a/webclient/src/hooks/useFireOnce/useFireOnce.spec.tsx b/webclient/src/hooks/useFireOnce/useFireOnce.spec.tsx
new file mode 100644
index 000000000..2f6ed34e0
--- /dev/null
+++ b/webclient/src/hooks/useFireOnce/useFireOnce.spec.tsx
@@ -0,0 +1,103 @@
+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
new file mode 100644
index 000000000..0b042a907
--- /dev/null
+++ b/webclient/src/hooks/useFireOnce/useFireOnce.ts
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000..219292ed7
--- /dev/null
+++ b/webclient/src/hooks/useLocaleSort.ts
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 000000000..83273a6d3
--- /dev/null
+++ b/webclient/src/hooks/useReduxEffect.tsx
@@ -0,0 +1,47 @@
+/**
+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
new file mode 100644
index 000000000..d270b3503
--- /dev/null
+++ b/webclient/src/i18n-backend.ts
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000..3c63e0abb
--- /dev/null
+++ b/webclient/src/i18n-default.json
@@ -0,0 +1,382 @@
+{
+  "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
new file mode 100644
index 000000000..ef1885965
--- /dev/null
+++ b/webclient/src/i18n.ts
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 000000000..9d08eb3ec
--- /dev/null
+++ b/webclient/src/images/Images.ts
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 000000000..1337edaa7
--- /dev/null
+++ b/webclient/src/images/countries/.gitignore
@@ -0,0 +1,6 @@
+# Ignore all files
+* 
+# Except gitignore
+!.gitignore
+
+!_Countries.ts
diff --git a/webclient/src/images/countries/_Countries.ts b/webclient/src/images/countries/_Countries.ts
new file mode 100644
index 000000000..a4867db46
--- /dev/null
+++ b/webclient/src/images/countries/_Countries.ts
@@ -0,0 +1,507 @@
+// 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
new file mode 100644
index 000000000..73a8c361b
--- /dev/null
+++ b/webclient/src/images/faces/_Faces.ts
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 000000000..931c5822d
Binary files /dev/null and b/webclient/src/images/faces/face1.jpg differ
diff --git a/webclient/src/images/faces/face2.jpg b/webclient/src/images/faces/face2.jpg
new file mode 100644
index 000000000..8b5bea967
Binary files /dev/null and b/webclient/src/images/faces/face2.jpg differ
diff --git a/webclient/src/images/faces/face3.jpg b/webclient/src/images/faces/face3.jpg
new file mode 100644
index 000000000..ace651dc0
Binary files /dev/null and b/webclient/src/images/faces/face3.jpg differ
diff --git a/webclient/src/images/index.ts b/webclient/src/images/index.ts
new file mode 100644
index 000000000..e96072916
--- /dev/null
+++ b/webclient/src/images/index.ts
@@ -0,0 +1 @@
+export * from './Images';
diff --git a/webclient/src/images/logo.png b/webclient/src/images/logo.png
new file mode 100644
index 000000000..7ce83bd20
Binary files /dev/null and b/webclient/src/images/logo.png differ
diff --git a/webclient/src/index.css b/webclient/src/index.css
new file mode 100644
index 000000000..c5f9b9230
--- /dev/null
+++ b/webclient/src/index.css
@@ -0,0 +1,70 @@
+@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
new file mode 100644
index 000000000..97b5bb014
--- /dev/null
+++ b/webclient/src/index.tsx
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000..beee1146e
--- /dev/null
+++ b/webclient/src/material-theme.ts
@@ -0,0 +1,239 @@
+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
new file mode 100644
index 000000000..6431bc5fc
--- /dev/null
+++ b/webclient/src/react-app-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="react-scripts" />
diff --git a/webclient/src/services/CardImporterService.ts b/webclient/src/services/CardImporterService.ts
new file mode 100644
index 000000000..691e86f0e
--- /dev/null
+++ b/webclient/src/services/CardImporterService.ts
@@ -0,0 +1,104 @@
+// 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
new file mode 100644
index 000000000..0d8c3d652
--- /dev/null
+++ b/webclient/src/services/ServerProps.ts
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 000000000..a060aedb1
--- /dev/null
+++ b/webclient/src/services/dexie/DexieDTOs/CardDTO.ts
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..17f600626
--- /dev/null
+++ b/webclient/src/services/dexie/DexieDTOs/HostDTO.ts
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 000000000..6ae2dd20a
--- /dev/null
+++ b/webclient/src/services/dexie/DexieDTOs/SetDTO.ts
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..bbfa1680d
--- /dev/null
+++ b/webclient/src/services/dexie/DexieDTOs/SettingDTO.ts
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000..35d537709
--- /dev/null
+++ b/webclient/src/services/dexie/DexieDTOs/TokenDTO.ts
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..9121f1f4b
--- /dev/null
+++ b/webclient/src/services/dexie/DexieDTOs/index.ts
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..18e7f35c4
--- /dev/null
+++ b/webclient/src/services/dexie/DexieSchemas/v1.schema.ts
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000..9dcd3b941
--- /dev/null
+++ b/webclient/src/services/dexie/DexieService.ts
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 000000000..593f19397
--- /dev/null
+++ b/webclient/src/services/dexie/index.ts
@@ -0,0 +1,2 @@
+export * from './DexieDTOs';
+export * from './DexieService';
diff --git a/webclient/src/services/index.ts b/webclient/src/services/index.ts
new file mode 100644
index 000000000..ebebeb65e
--- /dev/null
+++ b/webclient/src/services/index.ts
@@ -0,0 +1,3 @@
+export * from './CardImporterService';
+export * from './ServerProps';
+export * from './dexie';
diff --git a/webclient/src/setupTests.ts b/webclient/src/setupTests.ts
new file mode 100644
index 000000000..c4e40e2ec
--- /dev/null
+++ b/webclient/src/setupTests.ts
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 000000000..a01dba984
--- /dev/null
+++ b/webclient/src/store/actions/actionReducer.ts
@@ -0,0 +1,43 @@
+/**
+ * @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
new file mode 100644
index 000000000..4c5f9ef48
--- /dev/null
+++ b/webclient/src/store/actions/index.ts
@@ -0,0 +1 @@
+export { actionReducer } from './actionReducer';
diff --git a/webclient/src/store/common/SortUtil.ts b/webclient/src/store/common/SortUtil.ts
new file mode 100644
index 000000000..56910259d
--- /dev/null
+++ b/webclient/src/store/common/SortUtil.ts
@@ -0,0 +1,153 @@
+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
new file mode 100644
index 000000000..340676b6d
--- /dev/null
+++ b/webclient/src/store/common/index.ts
@@ -0,0 +1 @@
+export { default as SortUtil } from './SortUtil';
diff --git a/webclient/src/store/index.ts b/webclient/src/store/index.ts
new file mode 100644
index 000000000..b43f290c5
--- /dev/null
+++ b/webclient/src/store/index.ts
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000..3ebe3905a
--- /dev/null
+++ b/webclient/src/store/rooms/index.ts
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..98108fe8b
--- /dev/null
+++ b/webclient/src/store/rooms/rooms.actions.tsx
@@ -0,0 +1,71 @@
+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
new file mode 100644
index 000000000..c89b5ebc4
--- /dev/null
+++ b/webclient/src/store/rooms/rooms.dispatch.tsx
@@ -0,0 +1,58 @@
+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
new file mode 100644
index 000000000..c7b90ac84
--- /dev/null
+++ b/webclient/src/store/rooms/rooms.interfaces.tsx
@@ -0,0 +1,50 @@
+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
new file mode 100644
index 000000000..5898c7150
--- /dev/null
+++ b/webclient/src/store/rooms/rooms.reducer.tsx
@@ -0,0 +1,326 @@
+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
new file mode 100644
index 000000000..e1e7ec818
--- /dev/null
+++ b/webclient/src/store/rooms/rooms.selectors.tsx
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 000000000..0b07eadd1
--- /dev/null
+++ b/webclient/src/store/rooms/rooms.types.tsx
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000..0f39d7e37
--- /dev/null
+++ b/webclient/src/store/rootReducer.ts
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000..f2a9c5dca
--- /dev/null
+++ b/webclient/src/store/server/index.ts
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..ed1f06977
--- /dev/null
+++ b/webclient/src/store/server/server.actions.ts
@@ -0,0 +1,213 @@
+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
new file mode 100644
index 000000000..3a958043a
--- /dev/null
+++ b/webclient/src/store/server/server.dispatch.ts
@@ -0,0 +1,180 @@
+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
new file mode 100644
index 000000000..499197852
--- /dev/null
+++ b/webclient/src/store/server/server.interfaces.ts
@@ -0,0 +1,91 @@
+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
new file mode 100644
index 000000000..46daa4007
--- /dev/null
+++ b/webclient/src/store/server/server.reducer.ts
@@ -0,0 +1,352 @@
+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
new file mode 100644
index 000000000..263946425
--- /dev/null
+++ b/webclient/src/store/server/server.selectors.ts
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000..ab9307295
--- /dev/null
+++ b/webclient/src/store/server/server.types.ts
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 000000000..e6ef5df3a
--- /dev/null
+++ b/webclient/src/store/store.ts
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 000000000..b28bae203
--- /dev/null
+++ b/webclient/src/types/cards.ts
@@ -0,0 +1,93 @@
+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
new file mode 100644
index 000000000..f95a16eaa
--- /dev/null
+++ b/webclient/src/types/constants.spec.ts
@@ -0,0 +1,84 @@
+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
new file mode 100644
index 000000000..7341a22b1
--- /dev/null
+++ b/webclient/src/types/constants.ts
@@ -0,0 +1,6 @@
+// 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
new file mode 100644
index 000000000..0289b63ad
--- /dev/null
+++ b/webclient/src/types/countries.ts
@@ -0,0 +1,253 @@
+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
new file mode 100644
index 000000000..18212079e
--- /dev/null
+++ b/webclient/src/types/deckList.ts
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 000000000..421bc2615
--- /dev/null
+++ b/webclient/src/types/forms.ts
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000..b9fcc1dc2
--- /dev/null
+++ b/webclient/src/types/game.ts
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 000000000..00838a16d
--- /dev/null
+++ b/webclient/src/types/index.ts
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 000000000..17699fd0e
--- /dev/null
+++ b/webclient/src/types/languages.ts
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000..4c2f0364e
--- /dev/null
+++ b/webclient/src/types/logs.ts
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..d7f256011
--- /dev/null
+++ b/webclient/src/types/message.ts
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 000000000..5991ec6c1
--- /dev/null
+++ b/webclient/src/types/moderator.ts
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000..e69b1a499
--- /dev/null
+++ b/webclient/src/types/room.ts
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000..d91e8a7cb
--- /dev/null
+++ b/webclient/src/types/routes.ts
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000..305a5a810
--- /dev/null
+++ b/webclient/src/types/server.ts
@@ -0,0 +1,127 @@
+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
new file mode 100644
index 000000000..1b49616c5
--- /dev/null
+++ b/webclient/src/types/session.ts
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 000000000..c91394331
--- /dev/null
+++ b/webclient/src/types/settings.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..c3312732c
--- /dev/null
+++ b/webclient/src/types/sort.ts
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 000000000..2d0383eb7
--- /dev/null
+++ b/webclient/src/types/user.ts
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 000000000..1dae24d0c
--- /dev/null
+++ b/webclient/src/websocket/WebClient.ts
@@ -0,0 +1,89 @@
+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
new file mode 100644
index 000000000..5e8a83153
--- /dev/null
+++ b/webclient/src/websocket/commands/admin/adjustMod.ts
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000..5d4ae21bf
--- /dev/null
+++ b/webclient/src/websocket/commands/admin/index.ts
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000..16d2a574b
--- /dev/null
+++ b/webclient/src/websocket/commands/admin/reloadConfig.ts
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000..0624e823d
--- /dev/null
+++ b/webclient/src/websocket/commands/admin/shutdownServer.ts
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000..cb025f5a9
--- /dev/null
+++ b/webclient/src/websocket/commands/admin/updateServerMessage.ts
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000..2c68fcfb9
--- /dev/null
+++ b/webclient/src/websocket/commands/index.ts
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000..028eb4606
--- /dev/null
+++ b/webclient/src/websocket/commands/moderator/banFromServer.ts
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000..3378f5842
--- /dev/null
+++ b/webclient/src/websocket/commands/moderator/getBanHistory.ts
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 000000000..fce008eec
--- /dev/null
+++ b/webclient/src/websocket/commands/moderator/getWarnHistory.ts
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 000000000..f83e5eb1b
--- /dev/null
+++ b/webclient/src/websocket/commands/moderator/getWarnList.ts
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 000000000..cb4f2455c
--- /dev/null
+++ b/webclient/src/websocket/commands/moderator/index.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..29e3c4bd6
--- /dev/null
+++ b/webclient/src/websocket/commands/moderator/viewLogHistory.ts
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 000000000..bef9ee003
--- /dev/null
+++ b/webclient/src/websocket/commands/moderator/warnUser.ts
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000..e5fd66f80
--- /dev/null
+++ b/webclient/src/websocket/commands/room/createGame.ts
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000..18235618c
--- /dev/null
+++ b/webclient/src/websocket/commands/room/index.ts
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000..19a672924
--- /dev/null
+++ b/webclient/src/websocket/commands/room/joinGame.ts
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000..477ee39a0
--- /dev/null
+++ b/webclient/src/websocket/commands/room/leaveRoom.ts
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..c06abd3ab
--- /dev/null
+++ b/webclient/src/websocket/commands/room/roomSay.ts
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000..f9210cb9c
--- /dev/null
+++ b/webclient/src/websocket/commands/session/accountEdit.ts
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000..b735696a9
--- /dev/null
+++ b/webclient/src/websocket/commands/session/accountImage.ts
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 000000000..0b5ef0111
--- /dev/null
+++ b/webclient/src/websocket/commands/session/accountPassword.ts
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..74e41afeb
--- /dev/null
+++ b/webclient/src/websocket/commands/session/activate.ts
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000..6696d39d4
--- /dev/null
+++ b/webclient/src/websocket/commands/session/addToList.ts
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000..5b660fab1
--- /dev/null
+++ b/webclient/src/websocket/commands/session/connect.ts
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000..c77d89aa3
--- /dev/null
+++ b/webclient/src/websocket/commands/session/deckDel.ts
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..ff4b25ec3
--- /dev/null
+++ b/webclient/src/websocket/commands/session/deckDelDir.ts
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..a0c4bd461
--- /dev/null
+++ b/webclient/src/websocket/commands/session/deckDownload.ts
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..e84b8efb3
--- /dev/null
+++ b/webclient/src/websocket/commands/session/deckList.ts
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000..b9bca6208
--- /dev/null
+++ b/webclient/src/websocket/commands/session/deckNewDir.ts
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..af526c8fc
--- /dev/null
+++ b/webclient/src/websocket/commands/session/deckUpload.ts
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000..9fe567677
--- /dev/null
+++ b/webclient/src/websocket/commands/session/disconnect.ts
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..f6399e6a7
--- /dev/null
+++ b/webclient/src/websocket/commands/session/forgotPasswordChallenge.ts
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000..5e5fe3bbd
--- /dev/null
+++ b/webclient/src/websocket/commands/session/forgotPasswordRequest.ts
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 000000000..9312b71af
--- /dev/null
+++ b/webclient/src/websocket/commands/session/forgotPasswordReset.ts
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 000000000..507ba3e20
--- /dev/null
+++ b/webclient/src/websocket/commands/session/getGamesOfUser.ts
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000..709cc0baa
--- /dev/null
+++ b/webclient/src/websocket/commands/session/getUserInfo.ts
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000..829a74b71
--- /dev/null
+++ b/webclient/src/websocket/commands/session/index.ts
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 000000000..9f4699708
--- /dev/null
+++ b/webclient/src/websocket/commands/session/joinRoom.ts
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 000000000..b1e31621f
--- /dev/null
+++ b/webclient/src/websocket/commands/session/listRooms.ts
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..027a251d4
--- /dev/null
+++ b/webclient/src/websocket/commands/session/listUsers.ts
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000..db24b4f46
--- /dev/null
+++ b/webclient/src/websocket/commands/session/login.ts
@@ -0,0 +1,92 @@
+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
new file mode 100644
index 000000000..99b615562
--- /dev/null
+++ b/webclient/src/websocket/commands/session/message.ts
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000..795e0f71f
--- /dev/null
+++ b/webclient/src/websocket/commands/session/ping.ts
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..45b2fa977
--- /dev/null
+++ b/webclient/src/websocket/commands/session/register.ts
@@ -0,0 +1,74 @@
+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
new file mode 100644
index 000000000..222d9c57d
--- /dev/null
+++ b/webclient/src/websocket/commands/session/removeFromList.ts
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000..b7ab5ef92
--- /dev/null
+++ b/webclient/src/websocket/commands/session/requestPasswordSalt.ts
@@ -0,0 +1,78 @@
+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
new file mode 100644
index 000000000..eddd774f8
--- /dev/null
+++ b/webclient/src/websocket/commands/session/updateStatus.ts
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 000000000..77a325c1e
--- /dev/null
+++ b/webclient/src/websocket/events/common/index.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..557e57ac9
--- /dev/null
+++ b/webclient/src/websocket/events/common/playerPropertiesChanged.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..895eadfef
--- /dev/null
+++ b/webclient/src/websocket/events/game/index.ts
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 000000000..30cef87dc
--- /dev/null
+++ b/webclient/src/websocket/events/game/joinGame.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..74a4dc6c5
--- /dev/null
+++ b/webclient/src/websocket/events/game/leaveGame.ts
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 000000000..ed74f9b93
--- /dev/null
+++ b/webclient/src/websocket/events/index.ts
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000..5b571d388
--- /dev/null
+++ b/webclient/src/websocket/events/room/index.ts
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000..b3f922141
--- /dev/null
+++ b/webclient/src/websocket/events/room/interfaces.ts
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000..b1a5f6606
--- /dev/null
+++ b/webclient/src/websocket/events/room/joinRoom.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..6d45197fc
--- /dev/null
+++ b/webclient/src/websocket/events/room/leaveRoom.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..d460a5336
--- /dev/null
+++ b/webclient/src/websocket/events/room/listGames.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..4fe01cb6f
--- /dev/null
+++ b/webclient/src/websocket/events/room/removeMessages.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..5a96198ea
--- /dev/null
+++ b/webclient/src/websocket/events/room/roomSay.ts
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..08b19b45d
--- /dev/null
+++ b/webclient/src/websocket/events/session/addToList.ts
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 000000000..9c39db940
--- /dev/null
+++ b/webclient/src/websocket/events/session/connectionClosed.ts
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 000000000..8c0d49006
--- /dev/null
+++ b/webclient/src/websocket/events/session/gameJoined.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..9fe7bb1da
--- /dev/null
+++ b/webclient/src/websocket/events/session/index.ts
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000..8a1827cbd
--- /dev/null
+++ b/webclient/src/websocket/events/session/interfaces.ts
@@ -0,0 +1,78 @@
+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
new file mode 100644
index 000000000..faba2968e
--- /dev/null
+++ b/webclient/src/websocket/events/session/listRooms.ts
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000..f5673fe3f
--- /dev/null
+++ b/webclient/src/websocket/events/session/notifyUser.ts
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 000000000..20e2d7f54
--- /dev/null
+++ b/webclient/src/websocket/events/session/removeFromList.ts
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 000000000..ce89e1f3c
--- /dev/null
+++ b/webclient/src/websocket/events/session/serverIdentification.ts
@@ -0,0 +1,71 @@
+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
new file mode 100644
index 000000000..f9e52aa7a
--- /dev/null
+++ b/webclient/src/websocket/events/session/serverMessage.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..cdda893a4
--- /dev/null
+++ b/webclient/src/websocket/events/session/serverShutdown.ts
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 000000000..cb512db60
--- /dev/null
+++ b/webclient/src/websocket/events/session/userJoined.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..9e00e59e1
--- /dev/null
+++ b/webclient/src/websocket/events/session/userLeft.ts
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..bff08460b
--- /dev/null
+++ b/webclient/src/websocket/events/session/userMessage.ts
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..b52c97168
--- /dev/null
+++ b/webclient/src/websocket/index.ts
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000..9552d8abf
--- /dev/null
+++ b/webclient/src/websocket/persistence/AdminPresistence.ts
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..e39c1b5a9
--- /dev/null
+++ b/webclient/src/websocket/persistence/GamePersistence.ts
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000..e6a57f601
--- /dev/null
+++ b/webclient/src/websocket/persistence/ModeratorPresistence.ts
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000..a69e79338
--- /dev/null
+++ b/webclient/src/websocket/persistence/RoomPersistence.ts
@@ -0,0 +1,63 @@
+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
new file mode 100644
index 000000000..c9248745c
--- /dev/null
+++ b/webclient/src/websocket/persistence/SessionPersistence.ts
@@ -0,0 +1,237 @@
+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
new file mode 100644
index 000000000..f4df52645
--- /dev/null
+++ b/webclient/src/websocket/persistence/index.ts
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..df5169b4c
--- /dev/null
+++ b/webclient/src/websocket/services/KeepAliveService.spec.ts
@@ -0,0 +1,68 @@
+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
new file mode 100644
index 000000000..070a532e6
--- /dev/null
+++ b/webclient/src/websocket/services/KeepAliveService.ts
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 000000000..341bbeae3
--- /dev/null
+++ b/webclient/src/websocket/services/ProtobufService.ts
@@ -0,0 +1,158 @@
+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
new file mode 100644
index 000000000..95fa2d356
--- /dev/null
+++ b/webclient/src/websocket/services/WebSocketService.ts
@@ -0,0 +1,129 @@
+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
new file mode 100644
index 000000000..4d9d37ba6
--- /dev/null
+++ b/webclient/src/websocket/utils/NormalizeService.ts
@@ -0,0 +1,63 @@
+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
new file mode 100644
index 000000000..73b17d719
--- /dev/null
+++ b/webclient/src/websocket/utils/guid.util.ts
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..4147f4af8
--- /dev/null
+++ b/webclient/src/websocket/utils/index.ts
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000..77645694f
--- /dev/null
+++ b/webclient/src/websocket/utils/passwordHasher.ts
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000..e5321213b
--- /dev/null
+++ b/webclient/src/websocket/utils/sanitizeHtml.util.ts
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000..0e35af354
--- /dev/null
+++ b/webclient/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "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"
+  ]
+}